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_pkt.c | 3 | ||||
| -rw-r--r-- | ssl/s3_srvr.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 6 |
5 files changed, 6 insertions, 12 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index 1a4570e288..eafa0127b7 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -491,8 +491,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_pkt.c b/ssl/s3_pkt.c index 780acec505..2da4d8f1f1 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -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) && s->compress == NULL && s->msg_callback == NULL && SSL_USE_EXPLICIT_IV(s) && - EVP_CIPHER_flags(s-> - enc_write_ctx->cipher) & + EVP_CIPHER_flags(s->enc_write_ctx->cipher) & EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) { unsigned char aad[13]; EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM mb_param; diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 0aeed4cdec..ecbf7ea409 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 24f2670dfd..2cca8c79fa 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -476,8 +476,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; @@ -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. */ 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 |