Enc doesn't support AEAD ciphers.

[openssl.git] / fips / fips_post.c

diff --git a/fips/fips_post.c b/fips/fips_post.c
index 392bd5543b2724a90f121d1e5ff32eefd0ca013a..5a002db7da1d9b18552664207781c406724250bf 100644 (file)
--- a/fips/fips_post.c
+++ b/fips/fips_post.c
@@ -186,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;
        }
@@ -205,7 +207,6 @@ 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;
@@ -299,7 +300,7 @@ int fips_pkey_signature_test(int id, EVP_PKEY *pkey,
        if (pkey == NULL)
                {
                ret = 1;
-               /* Well actually sucess as we've set ret to 1 */
+               /* Well actually success as we've set ret to 1 */
                goto error;
                }
        if (!FIPS_digestinit(&mctx, digest))
@@ -333,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);