Report each cipher used with CMAC tests.

[openssl.git] / fips / hmac / fips_hmac_selftest.c

diff --git a/fips/hmac/fips_hmac_selftest.c b/fips/hmac/fips_hmac_selftest.c
index 34ac2472dbe441e543a813bae9474b5caec2d3c5..c95e73f347e5806d094898bc285be2d12bc1b993 100644 (file)
--- a/fips/hmac/fips_hmac_selftest.c
+++ b/fips/hmac/fips_hmac_selftest.c
@@ -156,11 +156,10 @@ int FIPS_selftest_hmac()
 
                if(memcmp(out,t->kaval,outlen))
                        {
 
                if(memcmp(out,t->kaval,outlen))
                        {

-                       FIPSerr(FIPS_F_FIPS_SELFTEST_HMAC,FIPS_R_SELFTEST_FAILED);

                        fips_post_failed(FIPS_TEST_HMAC, subid, NULL);
                        rv = 0;
                        }
                        fips_post_failed(FIPS_TEST_HMAC, subid, NULL);
                        rv = 0;
                        }

-               if (!fips_post_success(FIPS_TEST_HMAC, subid, NULL))
+               else if (!fips_post_success(FIPS_TEST_HMAC, subid, NULL))

                        goto err;
                }
 
                        goto err;
                }
 


@@ -171,6 +170,8 @@ int FIPS_selftest_hmac()
                fips_post_failed(FIPS_TEST_HMAC, subid, NULL);
                rv = 0;
                }
                fips_post_failed(FIPS_TEST_HMAC, subid, NULL);
                rv = 0;
                }

+       if (!rv)
+                  FIPSerr(FIPS_F_FIPS_SELFTEST_HMAC,FIPS_R_SELFTEST_FAILED);

        return rv;
        }
 #endif
        return rv;
        }
 #endif