From 47050853f13b07f91b5b4a058dcb188621296f21 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 21 Jan 2015 23:56:21 +0000 Subject: [PATCH] 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/rsa/rsa_eay.c | 5 ++--- engines/e_padlock.c | 4 +++- ssl/d1_srvr.c | 3 +-- ssl/s2_srvr.c | 3 +-- ssl/s3_lib.c | 10 ++++------ ssl/s3_srvr.c | 3 +-- ssl/ssl_sess.c | 6 ++---- 10 files changed, 19 insertions(+), 25 deletions(-) diff --git a/crypto/asn1/x_crl.c b/crypto/asn1/x_crl.c index cd5c0bfb18..e258c714b2 100644 --- 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) diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index d3da7e789f..d7f15b0699 100644 --- 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 4e75709053..d196dedfb3 100644 --- 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 a6df3be59b..b147fff8bd 100644 --- 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 a7683c5658..ab9d5fb892 100644 --- 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 5b52e2c3e8..c4ec9fe108 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -475,8 +475,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 65ccce3e02..daba6dd7ad 100644 --- 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_lib.c b/ssl/s3_lib.c index 93c9c269d3..de917d3f83 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3980,9 +3980,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; @@ -4035,9 +4034,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; diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 9989d4420e..486362d221 100644 --- 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 4c230b0c2f..74c1d1537f 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -505,8 +505,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; @@ -547,8 +546,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 -- 2.34.1