e_aes_cbc_hmac_sha1.c: handle zero-length payload and engage empty frag

countermeasure [from HEAD].

PR: 2778
This commit is contained in:
Andy Polyakov
2012-04-15 14:23:26 +00:00
parent e6255a7d1e
commit eb8a65db16
2 changed files with 11 additions and 5 deletions

View File

@@ -664,10 +664,14 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
if ( (sess == NULL) ||
(s->enc_write_ctx == NULL) ||
(EVP_MD_CTX_md(s->write_hash) == NULL))
{
#if 1
clear=s->enc_write_ctx?0:1; /* must be AEAD cipher */
#else
clear=1;
if (clear)
#endif
mac_size=0;
}
else
{
mac_size=EVP_MD_CTX_size(s->write_hash);