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

Update pairwise consistency checks to use SHA-256.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-02-15 16:18:18 +00:00
parent 25c6542944
commit 225a9e296b
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/dsa/dsa_key.c
View File

@ -85,8 +85,7 @@ static int fips_check_dsa(DSA *dsa)
pk.type = EVP_PKEY_DSA;
pk.pkey.dsa = dsa;
if (!fips_pkey_signature_test(&pk, tbs, -1,
NULL, 0, EVP_sha1(), 0, NULL))
if (!fips_pkey_signature_test(&pk, tbs, -1, NULL, 0, NULL, 0, NULL))
{
FIPSerr(FIPS_F_FIPS_CHECK_DSA,FIPS_R_PAIRWISE_TEST_FAILED);
fips_set_selftest_fail();

6
crypto/rsa/rsa_gen.c
View File

@ -94,11 +94,11 @@ int fips_check_rsa(RSA *rsa)
/* Perform pairwise consistency signature test */
if (!fips_pkey_signature_test(&pk, tbs, -1,
NULL, 0, EVP_sha1(), RSA_PKCS1_PADDING, NULL)
NULL, 0, NULL, RSA_PKCS1_PADDING, NULL)
|| !fips_pkey_signature_test(&pk, tbs, -1,
NULL, 0, EVP_sha1(), RSA_X931_PADDING, NULL)
NULL, 0, NULL, RSA_X931_PADDING, NULL)
|| !fips_pkey_signature_test(&pk, tbs, -1,
NULL, 0, EVP_sha1(), RSA_PKCS1_PSS_PADDING, NULL))
NULL, 0, NULL, RSA_PKCS1_PSS_PADDING, NULL))
goto err;
/* Now perform pairwise consistency encrypt/decrypt test */
ctbuf = OPENSSL_malloc(RSA_size(rsa));

3
fips/fips.c
View File

@ -454,6 +454,9 @@ int fips_pkey_signature_test(EVP_PKEY *pkey,
if (tbslen == -1)
tbslen = strlen((char *)tbs);
if (digest == NULL)
digest = EVP_sha256();
if (!FIPS_digestinit(&mctx, digest))
goto error;
if (!FIPS_digestupdate(&mctx, tbs, tbslen))