Update error codes.

[openssl.git] / fips / fips_test_suite.c

diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c
index bfd34c19247a4e6c81fb1f28b3f35b2972b303f5..c829d184a7f8a8bd037172a5d5ad525aa7a3b7ef 100644 (file)
--- a/fips/fips_test_suite.c
+++ b/fips/fips_test_suite.c
@@ -679,6 +679,11 @@ POST_ID id_list[] = {
        {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"},
@@ -693,6 +698,9 @@ POST_ID id_list[] = {
        {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}
 };
 
@@ -783,6 +791,13 @@ static int post_cb(int op, int id, int subid, void *ex)
                        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;
@@ -1062,6 +1077,10 @@ int main(int argc,char **argv)
                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;
     }