generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell 2015-01-22 03:30:12 +00:00
parent ae5c8664e5
commit 323d39e87f
10 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/asn1/x_crl.c
View File

@ -344,7 +344,9 @@ IMPLEMENT_ASN1_FUNCTIONS(X509_REVOKED)
IMPLEMENT_ASN1_DUP_FUNCTION(X509_REVOKED) IMPLEMENT_ASN1_DUP_FUNCTION(X509_REVOKED)
IMPLEMENT_ASN1_FUNCTIONS(X509_CRL_INFO) IMPLEMENT_ASN1_FUNCTIONS(X509_CRL_INFO)
IMPLEMENT_ASN1_FUNCTIONS(X509_CRL) IMPLEMENT_ASN1_FUNCTIONS(X509_CRL)
IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL) IMPLEMENT_ASN1_DUP_FUNCTION(X509_CRL)
static int X509_REVOKED_cmp(const X509_REVOKED *const *a, 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_ASN1_SET_OF(X509_REVOKED)
IMPLEMENT_STACK_OF(X509_CRL) IMPLEMENT_STACK_OF(X509_CRL)
IMPLEMENT_ASN1_SET_OF(X509_CRL) IMPLEMENT_ASN1_SET_OF(X509_CRL)

3
crypto/bio/bss_file.c
View File

@ -239,8 +239,7 @@ static int MS_CALLBACK file_read(BIO *b, char *out, int outl)
else else
ret = fread(out, 1, (int)outl, (FILE *)b->ptr); ret = fread(out, 1, (int)outl, (FILE *)b->ptr);
if (ret == 0 if (ret == 0
&& (b-> && (b->flags & BIO_FLAGS_UPLINK) ? UP_ferror((FILE *)b->ptr) :
flags & BIO_FLAGS_UPLINK) ? UP_ferror((FILE *)b->ptr) :
ferror((FILE *)b->ptr)) { ferror((FILE *)b->ptr)) {
SYSerr(SYS_F_FREAD, get_last_sys_error()); SYSerr(SYS_F_FREAD, get_last_sys_error());
BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB); BIOerr(BIO_F_FILE_READ, ERR_R_SYS_LIB);

5
crypto/ec/ecp_smpl.c
View File

@ -1299,9 +1299,8 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num,
for (i = 1; i < num; i++) { for (i = 1; i < num; i++) {
if (!BN_is_zero(&points[i]->Z)) { if (!BN_is_zero(&points[i]->Z)) {
if (!group-> if (!group->meth->field_mul(group, prod_Z[i], prod_Z[i - 1],
meth->field_mul(group, prod_Z[i], prod_Z[i - 1], &points[i]->Z, ctx))
&points[i]->Z, ctx))
goto err; goto err;
} else { } else {
if (!BN_copy(prod_Z[i], prod_Z[i - 1])) if (!BN_copy(prod_Z[i], prod_Z[i - 1]))

5
crypto/rsa/rsa_eay.c
View File

@ -842,9 +842,8 @@ static int RSA_eay_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
goto err; goto err;
if (rsa->e && rsa->n) { if (rsa->e && rsa->n) {
if (!rsa-> if (!rsa->meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx,
meth->bn_mod_exp(vrfy, r0, rsa->e, rsa->n, ctx, rsa->_method_mod_n))
rsa->_method_mod_n))
goto err; goto err;
/* /*
* If 'I' was greater than (or equal to) rsa->n, the operation will * If 'I' was greater than (or equal to) rsa->n, the operation will

4
engines/e_padlock.c
View File

@ -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) # if defined(NID_aes_256_ofb128) && ! defined (NID_aes_256_ofb)
# define NID_aes_256_ofb NID_aes_256_ofb128 # define NID_aes_256_ofb NID_aes_256_ofb128
# endif # 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_ecb,
NID_aes_128_cbc, NID_aes_128_cbc,
NID_aes_128_cfb, NID_aes_128_cfb,

3
ssl/d1_srvr.c
View File

@ -491,8 +491,7 @@ int dtls1_accept(SSL *s)
|| ((alg_k & SSL_kRSA) || ((alg_k & SSL_kRSA)
&& (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
|| (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
&& EVP_PKEY_size(s->cert-> && EVP_PKEY_size(s->cert->pkeys
pkeys
[SSL_PKEY_RSA_ENC].privatekey) * [SSL_PKEY_RSA_ENC].privatekey) *
8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher) 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
) )

3
ssl/s2_srvr.c
View File

@ -484,8 +484,7 @@ static int get_client_master_key(SSL *s)
if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c))) if ((i < 0) || ((!is_export && (i != EVP_CIPHER_key_length(c)))
|| (is_export && ((i != ek) || (is_export && ((i != ek)
|| (s->s2->tmp.clear + || (s->s2->tmp.clear +
(unsigned int)i != (unsigned int)i != (unsigned int)
(unsigned int)
EVP_CIPHER_key_length(c)))))) { EVP_CIPHER_key_length(c)))))) {
ERR_clear_error(); ERR_clear_error();
if (is_export) if (is_export)

3
ssl/s3_pkt.c
View File

@ -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) && len >= 4 * (int)(max_send_fragment = s->max_send_fragment) &&
s->compress == NULL && s->msg_callback == NULL && s->compress == NULL && s->msg_callback == NULL &&
SSL_USE_EXPLICIT_IV(s) && SSL_USE_EXPLICIT_IV(s) &&
EVP_CIPHER_flags(s-> EVP_CIPHER_flags(s->enc_write_ctx->cipher) &
enc_write_ctx->cipher) &
EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) { EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) {
unsigned char aad[13]; unsigned char aad[13];
EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param; EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param;

3
ssl/s3_srvr.c
View File

@ -475,8 +475,7 @@ int ssl3_accept(SSL *s)
|| ((alg_k & SSL_kRSA) || ((alg_k & SSL_kRSA)
&& (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL
|| (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher) || (SSL_C_IS_EXPORT(s->s3->tmp.new_cipher)
&& EVP_PKEY_size(s->cert-> && EVP_PKEY_size(s->cert->pkeys
pkeys
[SSL_PKEY_RSA_ENC].privatekey) * [SSL_PKEY_RSA_ENC].privatekey) *
8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher) 8 > SSL_C_EXPORT_PKEYLENGTH(s->s3->tmp.new_cipher)
) )

6
ssl/ssl_sess.c
View File

@ -476,8 +476,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
if (try_session_cache && if (try_session_cache &&
ret == NULL && ret == NULL &&
!(s-> !(s->session_ctx->session_cache_mode &
session_ctx->session_cache_mode &
SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)) { SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)) {
SSL_SESSION data; SSL_SESSION data;
data.ssl_version = s->version; 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. * well if and only if we are supposed to.
*/ */
if (! if (!
(s-> (s->session_ctx->session_cache_mode &
session_ctx->session_cache_mode &
SSL_SESS_CACHE_NO_INTERNAL_STORE)) SSL_SESS_CACHE_NO_INTERNAL_STORE))
/* /*
* The following should not return 1, otherwise, things are * The following should not return 1, otherwise, things are