From 93256bf5d148f3b8fa02a410b4477c6c9ca20e65 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 14 Sep 2011 15:49:50 +0000 Subject: [PATCH] Update CMAC/HMAC sefltests to use NIDs instead of function pointers. Simplify HMAC selftest as each test currently uses the same key and hash data. --- fips/cmac/fips_cmac_selftest.c | 17 +++++++---- fips/hmac/fips_hmac_selftest.c | 52 ++++++++++++++++++---------------- 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/fips/cmac/fips_cmac_selftest.c b/fips/cmac/fips_cmac_selftest.c index b307297305..89a491d78f 100644 --- a/fips/cmac/fips_cmac_selftest.c +++ b/fips/cmac/fips_cmac_selftest.c @@ -57,7 +57,7 @@ #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; @@ -65,7 +65,7 @@ typedef struct { /* from http://csrc.nist.gov/publications/nistpubs/800-38B/SP_800-38B.pdf */ 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, @@ -74,7 +74,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, @@ -82,7 +82,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, @@ -95,7 +95,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, @@ -118,7 +118,12 @@ int FIPS_selftest_cmac() for(n=0,t=vector; nalg)(); + 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; diff --git a/fips/hmac/fips_hmac_selftest.c b/fips/hmac/fips_hmac_selftest.c index c95e73f347..bdccf96f94 100644 --- a/fips/hmac/fips_hmac_selftest.c +++ b/fips/hmac/fips_hmac_selftest.c @@ -57,40 +57,40 @@ #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" */ +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" */ +const unsigned char hmac_kat_data[] = { + 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x23, 0x32 + }; + 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, @@ -98,9 +98,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, @@ -126,23 +124,29 @@ int FIPS_selftest_hmac() for(n=0,t=vector; nalg)(); + 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, t->key, strlen(t->key), md, NULL)) + if (!HMAC_Init_ex(&c, hmac_kat_key, sizeof(hmac_kat_key), + md, NULL)) { rv = -1; goto err; } - if (!HMAC_Update(&c, (const unsigned char *)t->iv, strlen(t->iv))) + 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, (const unsigned char *)t->iv, 1)) + if (!HMAC_Update(&c, hmac_kat_data, 1)) { rv = -1; goto err; -- GitLab