X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=fips%2Ffips_post.c;h=e55ec0840798822d9c004b698662a22f31b86f4d;hp=1ab156fb3f4f9487c02400341542f6990263a0a9;hb=2bfeb7dc831f0bbe4ba6f9347f792a45d72d1e20;hpb=ac892b7aa6532e0345e430208335403ead5d2de1

diff --git a/fips/fips_post.c b/fips/fips_post.c
index 1ab156fb3f..e55ec08407 100644
--- a/fips/fips_post.c
+++ b/fips/fips_post.c
@@ -105,12 +105,14 @@ void fips_post_end(void)
 	if (post_failure)
 		{
 		post_status = FIPS_POST_STATUS_FAILED;
-		fips_post_cb(FIPS_POST_END, 0, 0, NULL);
+		if(fips_post_cb)
+			fips_post_cb(FIPS_POST_END, 0, 0, NULL);
 		}
 	else
 		{
 		post_status = FIPS_POST_STATUS_OK;
-		fips_post_cb(FIPS_POST_END, 1, 0, NULL);
+		if (fips_post_cb)
+			fips_post_cb(FIPS_POST_END, 1, 0, NULL);
 		}
 	}
 
@@ -170,8 +172,12 @@ 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())
+		rv = 0;
 	if (!FIPS_selftest_des())
 		rv = 0;
 	if (!FIPS_selftest_rsa())
@@ -180,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,6 +211,7 @@ int fips_pkey_signature_test(int id, EVP_PKEY *pkey,
 	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;