X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=fips%2Fhmac%2Ffips_hmac_selftest.c;h=037761ce9f14a6467a2ef4fe880f2d3b6021f1c1;hp=a3967a4a777ee13faa575ec7af397b05df255859;hb=cf61940534836ebd8d8a13bae0dd2cbd273a3d49;hpb=14ae26f2e4f83b9ec0cbb02976e08a69bc5e5ba4

diff --git a/fips/hmac/fips_hmac_selftest.c b/fips/hmac/fips_hmac_selftest.c
index a3967a4a77..037761ce9f 100644
--- a/fips/hmac/fips_hmac_selftest.c
+++ b/fips/hmac/fips_hmac_selftest.c
@@ -1,5 +1,5 @@
 /* ====================================================================
- * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -53,43 +53,47 @@
 #include <openssl/err.h>
 #include <openssl/fips.h>
 #include <openssl/hmac.h>
+#include "fips_locl.h"
 
 #ifdef OPENSSL_FIPS
 typedef struct {
-	const EVP_MD *(*alg)(void);
-	const char *key, *iv;
-	unsigned char kaval[EVP_MAX_MD_SIZE];
+	int nid;
+	const unsigned char kaval[EVP_MAX_MD_SIZE];
 } HMAC_KAT;
 
+/* from http://csrc.nist.gov/publications/fips/fips198/fips-198a.pdf */
+/* "0123456789:;<=>?@ABC" */
+__fips_constseg
+static const unsigned char hmac_kat_key[] = {
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a,
+	0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43
+	};
+/* "Sample #2" */
+__fips_constseg
+static const unsigned char hmac_kat_data[] = {
+	0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x23, 0x32
+	};
+
+__fips_constseg
 static const HMAC_KAT vector[] = {
-    {	EVP_sha1,
-	/* from http://csrc.nist.gov/publications/fips/fips198/fips-198a.pdf */
-	"0123456789:;<=>?@ABC",
-	"Sample #2",
+    {	NID_sha1,
 	{ 0x09,0x22,0xd3,0x40,0x5f,0xaa,0x3d,0x19,
 	  0x4f,0x82,0xa4,0x58,0x30,0x73,0x7d,0x5c,
 	  0xc6,0xc7,0x5d,0x24 }
     },
-    {	EVP_sha224,
-	/* just keep extending the above... */
-	"0123456789:;<=>?@ABC",
-	"Sample #2",
+    {	NID_sha224,
 	{ 0xdd,0xef,0x0a,0x40,0xcb,0x7d,0x50,0xfb,
 	  0x6e,0xe6,0xce,0xa1,0x20,0xba,0x26,0xaa,
 	  0x08,0xf3,0x07,0x75,0x87,0xb8,0xad,0x1b,
 	  0x8c,0x8d,0x12,0xc7 }
     },
-    {	EVP_sha256,
-	"0123456789:;<=>?@ABC",
-	"Sample #2",
+    {	NID_sha256,
 	{ 0xb8,0xf2,0x0d,0xb5,0x41,0xea,0x43,0x09,
 	  0xca,0x4e,0xa9,0x38,0x0c,0xd0,0xe8,0x34,
 	  0xf7,0x1f,0xbe,0x91,0x74,0xa2,0x61,0x38,
 	  0x0d,0xc1,0x7e,0xae,0x6a,0x34,0x51,0xd9 }
     },
-    {	EVP_sha384,
-	"0123456789:;<=>?@ABC",
-	"Sample #2",
+    {	NID_sha384,
 	{ 0x08,0xbc,0xb0,0xda,0x49,0x1e,0x87,0xad,
 	  0x9a,0x1d,0x6a,0xce,0x23,0xc5,0x0b,0xf6,
 	  0xb7,0x18,0x06,0xa5,0x77,0xcd,0x49,0x04,
@@ -97,9 +101,7 @@ static const HMAC_KAT vector[] = {
 	  0x85,0x56,0x80,0x79,0x0c,0xbd,0x4d,0x50,
 	  0xa4,0x5f,0x29,0xe3,0x93,0xf0,0xe8,0x7f }
     },
-    {	EVP_sha512,
-	"0123456789:;<=>?@ABC",
-	"Sample #2",
+    {	NID_sha512,
 	{ 0x80,0x9d,0x44,0x05,0x7c,0x5b,0x95,0x41,
 	  0x05,0xbd,0x04,0x13,0x16,0xdb,0x0f,0xac,
 	  0x44,0xd5,0xa4,0xd5,0xd0,0x89,0x2b,0xd0,
@@ -112,26 +114,71 @@ static const HMAC_KAT vector[] = {
 };
 
 int FIPS_selftest_hmac()
-    {
-    size_t n;
-    unsigned int    outlen;
-    unsigned char   out[EVP_MAX_MD_SIZE];
-    const EVP_MD   *md;
-    const HMAC_KAT *t;
-
-    for(n=0,t=vector; n<sizeof(vector)/sizeof(vector[0]); n++,t++)
 	{
-	md = (*t->alg)();
-	HMAC(md,t->key,strlen(t->key),
-		(const unsigned char *)t->iv,strlen(t->iv),
-		out,&outlen);
+	size_t n;
+	unsigned int    outlen;
+	unsigned char   out[EVP_MAX_MD_SIZE];
+	const EVP_MD   *md;
+	const HMAC_KAT *t;
+	int rv = 1, subid = -1;
+	HMAC_CTX c;
+	HMAC_CTX_init(&c);
+
+
+	for(n=0,t=vector; n<sizeof(vector)/sizeof(vector[0]); n++,t++)
+		{
+		md = FIPS_get_digestbynid(t->nid);
+		if (!md)
+			{
+			rv = -1;
+			goto err;
+			}
+		subid = M_EVP_MD_type(md);
+		if (!fips_post_started(FIPS_TEST_HMAC, subid, 0))
+			continue;
+		if (!HMAC_Init_ex(&c, hmac_kat_key, sizeof(hmac_kat_key),
+								md, NULL))
+			{
+			rv = -1;
+			goto err;
+			}
+		if (!HMAC_Update(&c, hmac_kat_data, sizeof(hmac_kat_data)))
+			{
+			rv = -1;
+			goto err;
+			}
+		if (!fips_post_corrupt(FIPS_TEST_HMAC, subid, NULL))
+			{
+			if (!HMAC_Update(&c, hmac_kat_data, 1))
+				{
+				rv = -1;
+				goto err;
+				}
+			}
+		if (!HMAC_Final(&c, out, &outlen))
+			{
+			rv = -1;
+			goto err;
+			}
+
+		if(memcmp(out,t->kaval,outlen))
+			{
+			fips_post_failed(FIPS_TEST_HMAC, subid, NULL);
+			rv = 0;
+		    	}
+		else if (!fips_post_success(FIPS_TEST_HMAC, subid, NULL))
+			goto err;
+		}
 
-	if(memcmp(out,t->kaval,outlen))
-	    {
-	    FIPSerr(FIPS_F_FIPS_SELFTEST_HMAC,FIPS_R_SELFTEST_FAILED);
-	    return 0;
-	    }
+	err:
+	HMAC_CTX_cleanup(&c);
+	if (rv == -1)
+		{
+		fips_post_failed(FIPS_TEST_HMAC, subid, NULL);
+		rv = 0;
+		}
+	if (!rv)
+		   FIPSerr(FIPS_F_FIPS_SELFTEST_HMAC,FIPS_R_SELFTEST_FAILED);
+	return rv;
 	}
-    return 1;
-    }
 #endif