Use SHA-256 in fips_test_suite.

This commit is contained in:
Dr. Stephen Henson 2011-02-15 16:58:06 +00:00
parent 225a9e296b
commit c81f8f59be

View File

@ -116,7 +116,7 @@ static int FIPS_dsa_test(int bad)
if (bad) if (bad)
BN_add_word(dsa->pub_key, 1); BN_add_word(dsa->pub_key, 1);
if (!FIPS_digestinit(&mctx, EVP_sha1())) if (!FIPS_digestinit(&mctx, EVP_sha256()))
goto end; goto end;
if (!FIPS_digestupdate(&mctx, dgst, sizeof(dgst) - 1)) if (!FIPS_digestupdate(&mctx, dgst, sizeof(dgst) - 1))
goto end; goto end;
@ -124,7 +124,7 @@ static int FIPS_dsa_test(int bad)
if (!sig) if (!sig)
goto end; goto end;
if (!FIPS_digestinit(&mctx, EVP_sha1())) if (!FIPS_digestinit(&mctx, EVP_sha256()))
goto end; goto end;
if (!FIPS_digestupdate(&mctx, dgst, sizeof(dgst) - 1)) if (!FIPS_digestupdate(&mctx, dgst, sizeof(dgst) - 1))
goto end; goto end;
@ -160,20 +160,20 @@ static int FIPS_rsa_test(int bad)
if (!key || !bn) if (!key || !bn)
return 0; return 0;
BN_set_word(bn, 65537); BN_set_word(bn, 65537);
if (!RSA_generate_key_ex(key, 1024,bn,NULL)) if (!RSA_generate_key_ex(key, 2048,bn,NULL))
return 0; return 0;
BN_free(bn); BN_free(bn);
if (bad) if (bad)
BN_add_word(key->n, 1); BN_add_word(key->n, 1);
if (!FIPS_digestinit(&mctx, EVP_sha1())) if (!FIPS_digestinit(&mctx, EVP_sha256()))
goto end; goto end;
if (!FIPS_digestupdate(&mctx, input_ptext, sizeof(input_ptext) - 1)) if (!FIPS_digestupdate(&mctx, input_ptext, sizeof(input_ptext) - 1))
goto end; goto end;
if (!FIPS_rsa_sign_ctx(key, &mctx, RSA_PKCS1_PADDING, 0, NULL, buf, &slen)) if (!FIPS_rsa_sign_ctx(key, &mctx, RSA_PKCS1_PADDING, 0, NULL, buf, &slen))
goto end; goto end;
if (!FIPS_digestinit(&mctx, EVP_sha1())) if (!FIPS_digestinit(&mctx, EVP_sha256()))
goto end; goto end;
if (!FIPS_digestupdate(&mctx, input_ptext, sizeof(input_ptext) - 1)) if (!FIPS_digestupdate(&mctx, input_ptext, sizeof(input_ptext) - 1))
goto end; goto end;