e_rc4_hmac_md5.c: last commit was inappropriate for non-x86[_64] platforms.

[openssl.git] / fips / fips_post.c

diff --git a/fips/fips_post.c b/fips/fips_post.c
index 831e5d011ac2a447bda09a75a5f8f0d39c296eb8..8cd233436294e6a832253b6a590c750179f9099c 100644 (file)
--- a/fips/fips_post.c
+++ b/fips/fips_post.c
@@ -172,6 +172,8 @@ int FIPS_selftest(void)
                rv = 0;
        if (!FIPS_selftest_aes())
                rv = 0;
+       if (!FIPS_selftest_aes_ccm())
+               rv = 0;
        if (!FIPS_selftest_aes_gcm())
                rv = 0;
        if (!FIPS_selftest_aes_xts())
@@ -184,6 +186,8 @@ int FIPS_selftest(void)
                rv = 0;
        if (!FIPS_selftest_dsa())
                rv = 0;
+       if (!FIPS_selftest_ecdh())
+               rv = 0;
        fips_post_end();
        return rv;
        }
@@ -203,10 +207,10 @@ int fips_pkey_signature_test(int id, EVP_PKEY *pkey,
                        const char *fail_str)
        {       
        int subid;
-       void *ex = NULL;
        int ret = 0;
        unsigned char *sig = NULL;
        unsigned int siglen;
+       __fips_constseg
        static const unsigned char str1[]="12345678901234567890";
        DSA_SIG *dsig = NULL;
        ECDSA_SIG *esig = NULL;
@@ -330,7 +334,7 @@ int fips_pkey_signature_test(int id, EVP_PKEY *pkey,
                FIPSerr(FIPS_F_FIPS_PKEY_SIGNATURE_TEST,FIPS_R_TEST_FAILURE);
                if (fail_str)
                        FIPS_add_error_data(2, "Type=", fail_str);
-               fips_post_failed(id, subid, ex);
+               fips_post_failed(id, subid, pkey);
                return 0;
                }
        return fips_post_success(id, subid, pkey);