Commit: 4bc991384404d05e49e3aa622c142c7b7d05ef7b - Openssl (git)

TLS/SSL and crypto library

Commit MetaInfo

• Revision: 4bc991384404d05e49e3aa622c142c7b7d05ef7b (tree)
• Zeit: 2015-01-22 18:46:26
• Autor: Matt Caswell <matt@open...>
• Commiter: Matt Caswell

Log Message

Rerun util/openssl-format-source -v -c .

Reviewed-by: Tim Hudson <[e-mail]>

Ändern Zusammenfassung

• modified: crypto/asn1/x_crl.c
• modified: crypto/bio/bss_file.c
• modified: crypto/ec/ecp_smpl.c
• modified: crypto/pem/pem_all.c
• modified: crypto/rsa/rsa_eay.c
• modified: engines/e_padlock.c
• modified: ssl/d1_srvr.c
• modified: ssl/s2_srvr.c
• modified: ssl/s3_lib.c
• modified: ssl/s3_srvr.c
• modified: ssl/ssl_sess.c

Diff

--- a/crypto/asn1/x_crl.c
+++ b/crypto/asn1/x_crl.c
@@ -344,6 +344,7 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_REVOKED)
 IMPLEMENT_ASN1_FUNCTIONS(X509_CRL_INFO)
 
 IMPLEMENT_ASN1_FUNCTIONS(X509_CRL)
+
 IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL)
 
 static int X509_REVOKED_cmp(const X509_REVOKED *const *a,
@@ -510,4 +511,5 @@ IMPLEMENT_STACK_OF(X509_REVOKED)
 IMPLEMENT_ASN1_SET_OF(X509_REVOKED)
 
 IMPLEMENT_STACK_OF(X509_CRL)
+
 IMPLEMENT_ASN1_SET_OF(X509_CRL)

--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -239,8 +239,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
         else
             ret = fread(out, 1, (int)outl, (FILE *)b->ptr);
         if (ret == 0
-            && (b->
-                flags & BIO_FLAGS_UPLINK) ? UP_ferror((FILE *)b->ptr) :
+            && (b->flags & BIO_FLAGS_UPLINK) ? UP_ferror((FILE *)b->ptr) :
             ferror((FILE *)b->ptr)) {
             SYSerr(SYS_F_FREAD, get_last_sys_error());
             BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB);

--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -1650,9 +1650,8 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
 
     for (i = 1; i < num; i++) {
         if (!BN_is_zero(&points[i]->Z)) {
-            if (!group->
-                meth->field_mul(group, prod_Z[i], prod_Z[i - 1],
-                                &points[i]->Z, ctx))
+            if (!group->meth->field_mul(group, prod_Z[i], prod_Z[i - 1],
+                                        &points[i]->Z, ctx))
                 goto err;
         } else {
             if (!BN_copy(prod_Z[i], prod_Z[i - 1]))

--- a/crypto/pem/pem_all.c
+++ b/crypto/pem/pem_all.c
@@ -190,6 +190,7 @@ RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u)
 IMPLEMENT_PEM_write_cb_const(RSAPrivateKey, RSA, PEM_STRING_RSA,
                              RSAPrivateKey)
 
+
 IMPLEMENT_PEM_rw_const(RSAPublicKey, RSA, PEM_STRING_RSA_PUBLIC,
                        RSAPublicKey) IMPLEMENT_PEM_rw(RSA_PUBKEY, RSA,
                                                       PEM_STRING_PUBLIC,

--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -842,9 +842,8 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
         goto err;
 
     if (rsa->e && rsa->n) {
-        if (!rsa->
-            meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx,
-                             rsa->_method_mod_n))
+        if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx,
+                                   rsa->_method_mod_n))
             goto err;
         /*
          * If 'I' was greater than (or equal to) rsa->n, the operation will

--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -579,7 +579,9 @@ pushfd cld mov esi, ecx mov edi, ecx mov ecx, 60 up:lodsd
 #    if defined(NID_aes_256_ofb128) && ! defined (NID_aes_256_ofb)
 #     define NID_aes_256_ofb NID_aes_256_ofb128
 #    endif
-/* List of supported ciphers. */ static int padlock_cipher_nids[] = {
+/*
+ * List of supported ciphers.
+ */ static int padlock_cipher_nids[] = {
     NID_aes_128_ecb,
     NID_aes_128_cbc,
     NID_aes_128_cfb,

--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -394,8 +394,7 @@ int dtls1_accept(SSL *s)
                 || ((alg_k & SSL_kRSA)
                     && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
                         || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
-                            && EVP_PKEY_size(s->cert->
-                                             pkeys
+                            && EVP_PKEY_size(s->cert->pkeys
                                              [SSL_PKEY_RSA_ENC].privatekey) *
                             8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
                         )

--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -484,8 +484,7 @@ static int get_client_master_key(SSL *s)
     if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c)))
                     || (is_export && ((i != ek)
                                       || (s->s2->tmp.clear +
-                                          (unsigned int)i !=
-                                          (unsigned int)
+                                          (unsigned int)i != (unsigned int)
                                           EVP_CIPHER_key_length(c)))))) {
         ERR_clear_error();
         if (is_export)

--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3034,9 +3034,8 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
                          j++) {
                         if ((s->session->tlsext_ellipticcurvelist[2 * j] ==
                              ec_search1)
-                            && (s->
-                                session->tlsext_ellipticcurvelist[2 * j +
-                                                                  1] ==
+                            && (s->session->tlsext_ellipticcurvelist[2 * j +
+                                                                     1] ==
                                 ec_search2)) {
                             ec_ok = 1;
                             break;
@@ -3089,9 +3088,8 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
                          j++) {
                         if ((s->session->tlsext_ellipticcurvelist[2 * j] ==
                              ec_search1)
-                            && (s->
-                                session->tlsext_ellipticcurvelist[2 * j +
-                                                                  1] ==
+                            && (s->session->tlsext_ellipticcurvelist[2 * j +
+                                                                     1] ==
                                 ec_search2)) {
                             ec_ok = 1;
                             break;

--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -402,8 +402,7 @@ int ssl3_accept(SSL *s)
                 || ((alg_k & SSL_kRSA)
                     && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
                         || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
-                            && EVP_PKEY_size(s->cert->
-                                             pkeys
+                            && EVP_PKEY_size(s->cert->pkeys
                                              [SSL_PKEY_RSA_ENC].privatekey) *
                             8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
                         )

--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -439,8 +439,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
     } else if (r == 0 || (!ret && !len))
         goto err;
     else if (!ret
-             && !(s->
-                  session_ctx->session_cache_mode &
+             && !(s->session_ctx->session_cache_mode &
                   SSL_SESS_CACHE_NO_INTERNAL_LOOKUP))
 #else
     if (len == 0)
@@ -490,8 +489,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
              * well if and only if we are supposed to.
              */
             if (!
-                (s->
-                 session_ctx->session_cache_mode &
+                (s->session_ctx->session_cache_mode &
                  SSL_SESS_CACHE_NO_INTERNAL_STORE))
                 /*
                  * The following should not return 1, otherwise, things are