X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=fips%2Fcmac%2Ffips_cmac_selftest.c;h=70764dd7a163a875200492f71e286f7fb68e9c9f;hb=00b4ee7664051a0dc589b1d81ba56582576a6ca4;hp=8534190ff5b2ec532a3c7257e16f7e9ae48546ba;hpb=bd7e6bd44b2ebaff45aea1368886d4e9573e949c;p=oweals%2Fopenssl.git

diff --git a/fips/cmac/fips_cmac_selftest.c b/fips/cmac/fips_cmac_selftest.c
index 8534190ff5..70764dd7a1 100644
--- a/fips/cmac/fips_cmac_selftest.c
+++ b/fips/cmac/fips_cmac_selftest.c
@@ -53,18 +53,20 @@
 #include <openssl/err.h>
 #include <openssl/fips.h>
 #include <openssl/cmac.h>
+#include "fips_locl.h"
 
 #ifdef OPENSSL_FIPS
 typedef struct {
-	const EVP_CIPHER *(*alg)(void);
+	int nid;
 	const unsigned char key[EVP_MAX_KEY_LENGTH]; size_t keysize;
 	const unsigned char msg[64]; size_t msgsize;
 	const unsigned char mac[32]; size_t macsize;
 } CMAC_KAT;
 
 /* from http://csrc.nist.gov/publications/nistpubs/800-38B/SP_800-38B.pdf */
+__fips_constseg
 static const CMAC_KAT vector[] = {
-    {	EVP_aes_128_cbc,	/* Count = 32 from CMACGenAES128.txt */
+    {	NID_aes_128_cbc,	/* Count = 32 from CMACGenAES128.txt */
 	{ 0x77,0xa7,0x7f,0xaf, 0x29,0x0c,0x1f,0xa3,
 	  0x0c,0x68,0x3d,0xf1, 0x6b,0xa7,0xa7,0x7b, }, 128,
 	{ 0x02,0x06,0x83,0xe1, 0xf0,0x39,0x2f,0x4c,
@@ -73,7 +75,7 @@ static const CMAC_KAT vector[] = {
 	  0xe6,0x4d,0x58,0xe4, 0xe7,0xdc,0x2e,0x13, }, 256,
 	{ 0xfb,0xfe,0xa4,0x1b, }, 32
     },
-    {	EVP_aes_192_cbc,	/* Count = 23 from CMACGenAES192.txt */
+    {	NID_aes_192_cbc,	/* Count = 23 from CMACGenAES192.txt */
 	{ 0x7b,0x32,0x39,0x13, 0x69,0xaa,0x4c,0xa9,
 	  0x75,0x58,0x09,0x5b, 0xe3,0xc3,0xec,0x86,
 	  0x2b,0xd0,0x57,0xce, 0xf1,0xe3,0x2d,0x62, }, 192,
@@ -81,7 +83,7 @@ static const CMAC_KAT vector[] = {
 	{ 0xe4,0xd9,0x34,0x0b, 0x03,0xe6,0x7d,0xef,
 	  0xd4,0x96,0x9c,0xc1, 0xed,0x37,0x35,0xe6, }, 128,
     },
-    {	EVP_aes_256_cbc,	/* Count = 33 from CMACGenAES256.txt */
+    {	NID_aes_256_cbc,	/* Count = 33 from CMACGenAES256.txt */
 	{ 0x0b,0x12,0x2a,0xc8, 0xf3,0x4e,0xd1,0xfe,
 	  0x08,0x2a,0x36,0x25, 0xd1,0x57,0x56,0x14,
 	  0x54,0x16,0x7a,0xc1, 0x45,0xa1,0x0b,0xbf,
@@ -94,7 +96,7 @@ static const CMAC_KAT vector[] = {
 	  0xea,0x73,0xbe,0xdc, 0x72,0x14,0x71,0x3f, }, 384,
 	{ 0xf6,0x2c,0x46,0x32, 0x9b, }, 40,
     },
-    {	EVP_des_ede3_cbc,	/* Count = 41 from CMACGenTDES3.req */
+    {	NID_des_ede3_cbc,	/* Count = 41 from CMACGenTDES3.req */
 	{ 0x89,0xbc,0xd9,0x52, 0xa8,0xc8,0xab,0x37,
 	  0x1a,0xf4,0x8a,0xc7, 0xd0,0x70,0x85,0xd5,
 	  0xef,0xf7,0x02,0xe6, 0xd6,0x2c,0xdc,0x23, }, 192,
@@ -107,30 +109,74 @@ static const CMAC_KAT vector[] = {
 };
 
 int FIPS_selftest_cmac()
-    {
-    size_t n;
-    unsigned int     outlen;
-    unsigned char    out[32];
-    const EVP_CIPHER *cipher;
-    CMAC_CTX *ctx = CMAC_CTX_new();
-    const CMAC_KAT *t;
-
-    for(n=0,t=vector; n<sizeof(vector)/sizeof(vector[0]); n++,t++)
 	{
-	cipher = (*t->alg)();
-	CMAC_Init(ctx, t->key, t->keysize/8, cipher, 0);
-	CMAC_Update(ctx, t->msg, t->msgsize/8);
-	CMAC_Final(ctx, out, &outlen);
-	CMAC_CTX_cleanup(ctx);
+	size_t n, outlen;
+	unsigned char    out[32];
+	const EVP_CIPHER *cipher;
+	CMAC_CTX *ctx = CMAC_CTX_new();
+	const CMAC_KAT *t;
+	int subid = -1, rv = 1;
 
-	if(outlen < t->macsize/8 || memcmp(out,t->mac,t->macsize/8))
-	    {
-	    FIPSerr(FIPS_F_FIPS_SELFTEST_CMAC,FIPS_R_SELFTEST_FAILED);
-	    return 0;
-	    }
-	}
+	for(n=0,t=vector; n<sizeof(vector)/sizeof(vector[0]); n++,t++)
+		{
+		cipher = FIPS_get_cipherbynid(t->nid);
+		if (!cipher)
+			{
+			rv = -1;
+			goto err;
+			}
+		subid = M_EVP_CIPHER_nid(cipher);
+		if (!fips_post_started(FIPS_TEST_CMAC, subid, 0))
+			continue;
+		if (!CMAC_Init(ctx, t->key, t->keysize/8, cipher, 0))
+			{
+			rv = -1;
+			goto err;
+			}
+		if (!CMAC_Update(ctx, t->msg, t->msgsize/8))
+			{
+			rv = -1;
+			goto err;
+			}
+			
+		if (!fips_post_corrupt(FIPS_TEST_CMAC, subid, NULL))
+			{
+			if (!CMAC_Update(ctx, t->msg, 1))
+				{
+				rv = -1;
+				goto err;
+				}
+			}
+		if (!CMAC_Final(ctx, out, &outlen))
+			{
+			rv = -1;
+			goto err;
+			}
+		CMAC_CTX_cleanup(ctx);
+
+		if(outlen < t->macsize/8 || memcmp(out,t->mac,t->macsize/8))
+			{
+			fips_post_failed(FIPS_TEST_CMAC, subid, NULL);
+		    	rv = 0;
+		    	}
+		else if (!fips_post_success(FIPS_TEST_CMAC, subid, NULL))
+			{
+			rv = 0;
+			goto err;
+			}
+		}
 
-    CMAC_CTX_free(ctx);
-    return 1;
-    }
+	err:
+	CMAC_CTX_free(ctx);
+
+	if (rv == -1)
+		{
+		fips_post_failed(FIPS_TEST_CMAC, subid, NULL);
+		rv = 0;
+		}
+	if (!rv)
+		   FIPSerr(FIPS_F_FIPS_SELFTEST_CMAC,FIPS_R_SELFTEST_FAILED);
+
+	return rv;
+	}
 #endif