From 1b0ae81f4ad3d0d79175e1bd8d86a172a265c0cd Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Wed, 4 Apr 2012 20:50:58 +0000 Subject: [PATCH] ssl/ssl_ciph.c: interim solution for assertion in d1_pkt.c(444) [from HEAD]. PR: 2778 --- ssl/ssl_ciph.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index ac643c928c..b96d26faba 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -616,18 +616,19 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc, { const EVP_CIPHER *evp; - if (s->ssl_version >= TLS1_VERSION && - c->algorithm_enc == SSL_RC4 && + if (s->ssl_version>>8 != TLS1_VERSION_MAJOR || + s->ssl_version < TLS1_VERSION) + return 1; + + if (c->algorithm_enc == SSL_RC4 && c->algorithm_mac == SSL_MD5 && (evp=EVP_get_cipherbyname("RC4-HMAC-MD5"))) *enc = evp, *md = NULL; - else if (s->ssl_version >= TLS1_VERSION && - c->algorithm_enc == SSL_AES128 && + else if (c->algorithm_enc == SSL_AES128 && c->algorithm_mac == SSL_SHA1 && (evp=EVP_get_cipherbyname("AES-128-CBC-HMAC-SHA1"))) *enc = evp, *md = NULL; - else if (s->ssl_version >= TLS1_VERSION && - c->algorithm_enc == SSL_AES256 && + else if (c->algorithm_enc == SSL_AES256 && c->algorithm_mac == SSL_SHA1 && (evp=EVP_get_cipherbyname("AES-256-CBC-HMAC-SHA1"))) *enc = evp, *md = NULL; -- 2.25.1