generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ssl/ssl_ciph.c: interim solution for assertion in d1_pkt.c(444).

Browse Source 
PR: 2778
This commit is contained in:
Andy Polyakov 2012-04-04 20:45:51 +00:00
parent fd2b65ce53
commit a20152bdaf
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ssl/ssl_ciph.c
View File

@ -616,18 +616,19 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
{ {
const EVP_CIPHER *evp; const EVP_CIPHER *evp;
if (s->ssl_version >= TLS1_VERSION && if (s->ssl_version>>8 != TLS1_VERSION_MAJOR ||
c->algorithm_enc == SSL_RC4 && s->ssl_version < TLS1_VERSION)
return 1;
if (c->algorithm_enc == SSL_RC4 &&
c->algorithm_mac == SSL_MD5 && c->algorithm_mac == SSL_MD5 &&
(evp=EVP_get_cipherbyname("RC4-HMAC-MD5"))) (evp=EVP_get_cipherbyname("RC4-HMAC-MD5")))
*enc = evp, *md = NULL; *enc = evp, *md = NULL;
else if (s->ssl_version >= TLS1_VERSION && else if (c->algorithm_enc == SSL_AES128 &&
c->algorithm_enc == SSL_AES128 &&
c->algorithm_mac == SSL_SHA1 && c->algorithm_mac == SSL_SHA1 &&
(evp=EVP_get_cipherbyname("AES-128-CBC-HMAC-SHA1"))) (evp=EVP_get_cipherbyname("AES-128-CBC-HMAC-SHA1")))
*enc = evp, *md = NULL; *enc = evp, *md = NULL;
else if (s->ssl_version >= TLS1_VERSION && else if (c->algorithm_enc == SSL_AES256 &&
c->algorithm_enc == SSL_AES256 &&
c->algorithm_mac == SSL_SHA1 && c->algorithm_mac == SSL_SHA1 &&
(evp=EVP_get_cipherbyname("AES-256-CBC-HMAC-SHA1"))) (evp=EVP_get_cipherbyname("AES-256-CBC-HMAC-SHA1")))
*enc = evp, *md = NULL; *enc = evp, *md = NULL;