diff options
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/d1_srvr.c | 3 | ||||
| -rw-r--r-- | ssl/s2_srvr.c | 3 | ||||
| -rw-r--r-- | ssl/s3_lib.c | 10 | ||||
| -rw-r--r-- | ssl/s3_srvr.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 6 |
5 files changed, 9 insertions, 16 deletions
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 |