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_srvr.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index 57f9ac8e96..c5dac9fa2c 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -380,8 +380,7 @@ int dtls1_accept(SSL *s) || ((l & 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 d20634a7b9..a1f82d2a37 100644 --- a/ssl/s2_srvr.c +++ b/ssl/s2_srvr.c @@ -482,8 +482,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_srvr.c b/ssl/s3_srvr.c index 6c0da64041..ae29dacabe 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -365,8 +365,7 @@ int ssl3_accept(SSL *s) || ((l & 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 b96c221c80..9c797e3ed6 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -318,8 +318,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, } else if (r == 0 || (!ret && !len)) goto err; else if (!ret - && !(s-> - session_ctx->session_cache_mode & + && !(s->session_ctx->session_cache_mode & SSL_SESS_CACHE_NO_INTERNAL_LOOKUP)) #else if (len == 0) |