ssl/t1_enc.c: pay attention to EVP_CIPH_FLAG_CUSTOM_CIPHER.

This commit is contained in:
Andy Polyakov 2012-03-13 19:20:55 +00:00
parent b2ae61ecf2
commit d2add2efaa

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)
{