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 6f5970a7b44e3f341dce90c3774783c316fff687..099b264642c3f1ce710e464d0bbc5b68886e056c 100644 (file)
--- a/crypto/asn1/x_crl.c
+++ b/crypto/asn1/x_crl.c
@@ -115,6 +115,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,
@@ -143,4 +144,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 c4de51bfd4f57b0b373b02db3015584d82320a37..f9b9383a8cf0c5325c4849d36fad6269f3c34ec4 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -195,8 +195,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 6b27ee660ba7ac9e805710c810b38d0a3dd60705..3548e1be28520b8f76e5e977c431dc778c70ee9b 100644 (file)
--- 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]))

diff --git a/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c
index 05c4bde2bb8e05a9cc0279f98bde1d4e01db5359..54ace8b0efee48240aa235db63d7fa50d6e5cc92 100644 (file)
--- a/crypto/engine/eng_padlock.c
+++ b/crypto/engine/eng_padlock.c
@@ -573,7 +573,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/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index ba0373a6f91dd1a48cf34bb7e2761c0b366157eb..57b5d25c073305fb73cf7792fede1f95ea6fccde 100644 (file)
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -840,9 +840,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/fips/rsa/fips_rsa_eay.c b/fips/rsa/fips_rsa_eay.c
index 423a6bfaad926275ebb7b3df36cd5c866551ebb6..82f370f3cce625be7fc9c4464203d440e7c7d551 100644 (file)
--- a/fips/rsa/fips_rsa_eay.c
+++ b/fips/rsa/fips_rsa_eay.c
@@ -850,9 +850,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/ssl/d1_srvr.c b/ssl/d1_srvr.c
index 57f9ac8e9613527d8eceb35e172679b414e9c73d..c5dac9fa2caaa69dbf9f91507c5e49a16846d5af 100644 (file)
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -380,8 +380,7 @@ int dtls1_accept(SSL *s)
                 || ((l & 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 d20634a7b9e3d8752f83d5bdf1e60af777d684ed..a1f82d2a37e74c1f8114e49fcbf8c29ce4fa4b97 100644 (file)
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -482,8 +482,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_srvr.c b/ssl/s3_srvr.c
index 6c0da64041f9fdecea6b81b888d759fc7085e4ea..ae29dacabe46440aeafbf732cd278884cc11870c 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -365,8 +365,7 @@ int ssl3_accept(SSL *s)
                 || ((l & 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 b96c221c80f22a1a800504b1ec49eb57984643cf..9c797e3ed60650c50bb5e3bd9b6eff491812a2c6 100644 (file)
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -318,8 +318,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)