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

ssl/t1_enc.c: pay attention to EVP_CIPH_FLAG_CUSTOM_CIPHER [from HEAD].

Browse Source
This commit is contained in:
Andy Polyakov 2012-03-13 19:21:15 +00:00
parent bcf9cf89e7
commit 9cc42cb091
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/t1_enc.c
View File

@ -825,7 +825,10 @@ int tls1_enc(SSL *s, int send)
}
}
if (EVP_Cipher(ds,rec->data,rec->input,l) < 0)
i = EVP_Cipher(ds,rec->data,rec->input,l);
if ((EVP_CIPHER_flags(ds->cipher)&EVP_CIPH_FLAG_CUSTOM_CIPHER)
?(i<0)
:(i==0))
return -1; /* AEAD can fail to verify MAC */
if (EVP_CIPHER_mode(enc) == EVP_CIPH_GCM_MODE && !send)
{