wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Detect symmetric crypto errors in PKCS7_decrypt.

Browse source 
Thanks to Ivan Nestlerode <inestlerode@us.ibm.com> for reporting this bug.
This commit is contained in:
Dr. Stephen Henson 2012-02-27 15:23:04 +00:00
parent a7096946fa
commit e5bf2f5d4c
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crypto/pkcs7/pk7_smime.c
View file

@ -573,15 +573,30 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)
return 0;
}
ret = SMIME_text(bread, data);
if (ret > 0 && BIO_method_type(tmpmem) == BIO_TYPE_CIPHER)
{
if (!BIO_get_cipher_status(tmpmem))
ret = 0;
}
BIO_free_all(bread);
return ret;
} else {
for(;;) {
i = BIO_read(tmpmem, buf, sizeof(buf));
if(i <= 0) break;
if(i <= 0)
{
ret = 1;
if (BIO_method_type(tmpmem) == BIO_TYPE_CIPHER)
{
if (!BIO_get_cipher_status(tmpmem))
ret = 0;
}
break;
}
BIO_write(data, buf, i);
}
BIO_free_all(tmpmem);
return 1;
return ret;
}
}