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

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c
index 8012eb140bb37df23137066becf872bc879f19cd..027950330d8b67815a7743d0cbf9ddfba11b5431 100644 (file)
--- a/crypto/asn1/x_crl.c
+++ b/crypto/asn1/x_crl.c
@@ -344,7 +344,9 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_REVOKED)
 IMPLEMENT_ASN1_DUP_FUNCTION(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,
@@ -511,4 +513,5 @@ IMPLEMENT_STACK_OF(X509_REVOKED)
 IMPLEMENT_ASN1_SET_OF(X509_REVOKED)
 
 IMPLEMENT_STACK_OF(X509_CRL)
+
 IMPLEMENT_ASN1_SET_OF(X509_CRL)

diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index d3da7e789f78324f1fee2b7e9c7d011e9829dd1c..d7f15b0699c91d202e1033619a1e71a1aa9ea467 100644 (file)
--- 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);

diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c
index 4e75709053fd4a468b53d18487eb32bd75116d20..d196dedfb31471c93426303a27bcf82731a7cc42 100644 (file)
--- a/crypto/ec/ecp_smpl.c
+++ b/crypto/ec/ecp_smpl.c
@@ -1299,9 +1299,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]))

diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index a6df3be59b70576cabcc98a26da3c129f38fb7a1..b147fff8bd6086e1f712459521a98c4e00492458 100644 (file)
--- 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

diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index a7683c56584ac8950b0701fe983e6dbf187e5a15..ab9d5fb89276a3d6088eb53a2d7d3088f677741b 100644 (file)
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -587,7 +587,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,

diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index 1a4570e288cc7e6cf664546ee8db5beb681209d6..eafa0127b7c7582083936fe90ea2918b3bb4ef63 100644 (file)
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -491,8 +491,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)
                         )

diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index 65ccce3e02c28473f8cc2102b54b270bf747974a..daba6dd7addc6177d1cc465a5b6ea60adc094a13 100644 (file)
--- 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)

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 780acec50571a83b37dd7da68e8e730e56d95361..2da4d8f1f173c5f72224389d65a25fa48567cf8e 100644 (file)
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -684,8 +684,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
         len >= 4 * (int)(max_send_fragment = s->max_send_fragment) &&
         s->compress == NULL && s->msg_callback == NULL &&
         SSL_USE_EXPLICIT_IV(s) &&
-        EVP_CIPHER_flags(s->
-                         enc_write_ctx->cipher) &
+        EVP_CIPHER_flags(s->enc_write_ctx->cipher) &
         EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) {
         unsigned char aad[13];
         EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param;

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 0aeed4cdecc1910c76288c27e0734c4afdf18a61..ecbf7ea409bffb4780f40bd4c0f2a758d2d1e9ef 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -475,8 +475,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)
                         )

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 24f2670dfd034765023195b6086fe79d3932e13a..2cca8c79fa55f965b912bd198034b72a44c5ee4d 100644 (file)
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -476,8 +476,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
 
     if (try_session_cache &&
         ret == NULL &&
-        !(s->
-          session_ctx->session_cache_mode &
+        !(s->session_ctx->session_cache_mode &
           SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)) {
         SSL_SESSION data;
         data.ssl_version = s->version;
@@ -518,8 +517,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