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

PR: 2315

Browse source 
Use consistent calculation for PSS salt length.
This commit is contained in:
Dr. Stephen Henson 2010-08-10 13:01:49 +00:00
parent 33d9c8348a
commit 0b789adc67
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crypto/rsa/rsa_ameth.c
View file

@ -588,7 +588,11 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
if (saltlen == -1) if (saltlen == -1)
saltlen = EVP_MD_size(sigmd); saltlen = EVP_MD_size(sigmd);
else if (saltlen == -2) else if (saltlen == -2)
{
saltlen = EVP_PKEY_size(pk) - EVP_MD_size(sigmd) - 2; saltlen = EVP_PKEY_size(pk) - EVP_MD_size(sigmd) - 2;
if (((EVP_PKEY_bits(pk) - 1) & 0x7) == 0)
saltlen--;
}
pss = RSA_PSS_PARAMS_new(); pss = RSA_PSS_PARAMS_new();
if (!pss) if (!pss)
goto err; goto err;