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-21 23:56:21 +00:00
parent 10621efd32
commit 47050853f1
10 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/asn1/x_crl.c
View File

@ -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)

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
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);

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++) {
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]))

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;
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

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)
# 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,

3
ssl/d1_srvr.c
View File

@ -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)
)

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)))
|| (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)

10
ssl/s3_lib.c
View File

@ -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;

3
ssl/s3_srvr.c
View File

@ -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)
)

6
ssl/ssl_sess.c
View File

@ -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