From 6f1f3c665331d73c4ec08d653d100fa52c44cd60 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 22 Jan 2015 02:48:18 +0000 Subject: Rerun util/openssl-format-source -v -c . Reviewed-by: Tim Hudson --- crypto/asn1/x_crl.c | 2 ++ crypto/bio/bss_file.c | 3 +-- crypto/ec/ecp_smpl.c | 5 ++--- crypto/engine/eng_padlock.c | 4 +++- crypto/rsa/rsa_eay.c | 5 ++--- fips/rsa/fips_rsa_eay.c | 5 ++--- ssl/d1_srvr.c | 3 +-- ssl/s2_srvr.c | 3 +-- ssl/s3_srvr.c | 3 +-- ssl/ssl_sess.c | 3 +-- 10 files changed, 16 insertions(+), 20 deletions(-) diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c index 6f5970a7b4..099b264642 100644 --- 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 c4de51bfd4..f9b9383a8c 100644 --- 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 6b27ee660b..3548e1be28 100644 --- 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 05c4bde2bb..54ace8b0ef 100644 --- 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 ba0373a6f9..57b5d25c07 100644 --- 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 423a6bfaad..82f370f3cc 100644 --- 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 57f9ac8e96..c5dac9fa2c 100644 --- 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 d20634a7b9..a1f82d2a37 100644 --- 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 6c0da64041..ae29dacabe 100644 --- 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 b96c221c80..9c797e3ed6 100644 --- 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) -- cgit v1.2.3