{NID_sha256, "SHA256"},
{NID_sha384, "SHA384"},
{NID_sha512, "SHA512"},
+ {NID_hmacWithSHA1, "HMAC-SHA1"},
+ {NID_hmacWithSHA224, "HMAC-SHA224"},
+ {NID_hmacWithSHA256, "HMAC-SHA256"},
+ {NID_hmacWithSHA384, "HMAC-SHA384"},
+ {NID_hmacWithSHA512, "HMAC-SHA512"},
{EVP_PKEY_RSA, "RSA"},
{EVP_PKEY_DSA, "DSA"},
{EVP_PKEY_EC, "ECDSA"},
{NID_aes_256_xts, "AES-256-XTS"},
{NID_des_ede3_cbc, "DES-EDE3-CBC"},
{NID_des_ede3_ecb, "DES-EDE3-ECB"},
+ {NID_X9_62_prime256v1, "P-256"},
+ {NID_secp384r1, "P-384"},
+ {NID_secp521r1, "P-521"},
{0, NULL}
};
sprintf(asctmp, "%s DF", lookup_id(subid));
exstr = asctmp;
}
+ else if (subid >> 16)
+ {
+ sprintf(asctmp, "%s %s",
+ lookup_id(subid >> 16),
+ lookup_id(subid & 0xFFFF));
+ exstr = asctmp;
+ }
else
exstr = lookup_id(subid);
break;
{
case FIPS_POST_BEGIN:
#ifdef FIPS_POST_TIME
+ clock_getres(CLOCK_REALTIME, &tstart);
+ printf("\tTimer resolution %ld s, %ld ns\n",
+ (long)tstart.tv_sec, (long)tstart.tv_nsec);
clock_gettime(CLOCK_REALTIME, &tstart);
#endif
printf("\tPOST started\n");
FIPS_post_set_callback(post_cb);
- printf("\tFIPS-mode test application\n\n");
+ printf("\tFIPS-mode test application\n");
+
+ printf("\t%s\n\n", FIPS_module_version_text());
if (argv[1]) {
/* Corrupted KAT tests */
}
if (!no_exit) {
fips_algtest_init_nofips();
- if (!FIPS_mode_set(1)) {
+ if (!FIPS_module_mode_set(1)) {
printf("Power-up self test failed\n");
exit(1);
}
/* Power-up self test
*/
ERR_clear_error();
- test_msg("2. Automatic power-up self test", FIPS_mode_set(1));
- if (!FIPS_mode())
+ test_msg("2. Automatic power-up self test", FIPS_module_mode_set(1));
+ if (!FIPS_module_mode())
exit(1);
if (do_drbg_stick)
FIPS_drbg_stick();
Zeroize() ? "successful as expected"
: Fail("failed INCORRECTLY!") );
+ printf("11. Complete DRBG health check...\n\t%s\n",
+ FIPS_selftest_drbg_all() ? "successful as expected"
+ : Fail("failed INCORRECTLY!") );
+
printf("\nAll tests completed with %d errors\n", Error);
return Error ? 1 : 0;
}