diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-04-04 20:51:27 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-04-04 20:51:27 +0000 |
| commit | 3f98d7c0b5a6a64d440c99baa730728335adfb98 (patch) | |
| tree | a82d69477d5ce3e5821f1b2b6a5d37e559556dbe | |
| parent | d2f950c9843d9c5e30fd13d495f75561fd1512ea (diff) | |
ssl/ssl_ciph.c: interim solution for assertion in d1_pkt.c(444) [from HEAD].
PR: 2778
| -rw-r--r-- | ssl/ssl_ciph.c | 13 |
1 files 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; |