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 b3849e7dcc82c204e3e548d5e8ce97add21276e8..0776383448e6c1c93b657faca5d55efaa498d1c8 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -239,8 +239,7 @@ static int 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/pem/pem_all.c b/crypto/pem/pem_all.c
index 1a867a8867c881ecbe95b4d18deb4ab8afe5e72c..8ef8f18c42caf9f3b6eb3e4618e2351353a1b659 100644 (file)
--- 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,

diff --git a/crypto/rsa/rsa_eay.c b/crypto/rsa/rsa_eay.c
index e1981d0b3d02719b7b2d336c365a2b1065cbf9d4..b8d9221592358efc454dbf3e8f582a3ad4ccdeee 100644 (file)
--- a/crypto/rsa/rsa_eay.c
+++ b/crypto/rsa/rsa_eay.c
@@ -881,9 +881,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 0eabf41d26c39359de96bcb07dc27b9699aaf207..1ccdc35e4db01a3273a5ddef5b5c754716297b9d 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/s3_pkt.c b/ssl/s3_pkt.c
index 737dabbce0f35e38923a0239cb2f4275229b5814..c1421b1d677523c905d759f3fc1a508f7a70b780 100644 (file)
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -710,8 +710,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
         u_len >= 4 * (max_send_fragment = s->max_send_fragment) &&
         s->compress == NULL && s->msg_callback == NULL &&
         !SSL_USE_ETM(s) && 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;
@@ -921,8 +920,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
 #if 0 && !defined(OPENSSL_NO_MULTIBLOCK) && EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK
     if (type == SSL3_RT_APPLICATION_DATA && s->compress == NULL &&
         !SSL_USE_ETM(s) && 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)
         do {
             unsigned char aad[13];

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index f77c4c6c072e653067df230a7a0dc766db56d309..0191790880bb10cf01d10c27266664779a635c69 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -480,8 +480,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 9ee1366d72a73f8a0029f148829922c2e377281a..ed17429b07ff3089f69770aa7a725a4a9436aa96 100644 (file)
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -468,8 +468,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;
@@ -510,8 +509,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