Rename sparc symbols.

[openssl.git] / fips / fips_test_suite.c

diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c
index 58dd669b266554b4cb014fdd00fc86d6d1ba89d3..6046ae0f86c1b68558258f849418c16ff3716383 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"},
@@ -811,6 +816,9 @@ static int post_cb(int op, int id, int subid, void *ex)
                {
                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");
@@ -871,7 +879,9 @@ int main(int argc,char **argv)
 
     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 */
@@ -942,7 +952,7 @@ int main(int argc,char **argv)
         }
        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);
                }
@@ -961,8 +971,8 @@ int main(int argc,char **argv)
     /* 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();