From e2129d29392f4f37b2facb31429cda71cac74a0d Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Date: Thu, 9 May 2019 20:49:53 -0400
Subject: [PATCH] tpm2: Add CMAC test cases from RFC 4493

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
---
 src/tpm2/AlgorithmTests.c | 45 +++++++++++++++++++++++++++++
 src/tpm2/HashTestData.h   | 60 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/src/tpm2/AlgorithmTests.c b/src/tpm2/AlgorithmTests.c
index f6befe2f..d30c6f82 100644
--- a/src/tpm2/AlgorithmTests.c
+++ b/src/tpm2/AlgorithmTests.c
@@ -154,6 +154,42 @@ TestHash(
     }
     return TPM_RC_SUCCESS;
 }
+// libtpms added begin
+#if ALG_CMAC
+static TPM_RC
+TestCMAC(
+	 ALGORITHM_VECTOR    *toTest
+	 )
+{
+    SMAC_STATE          state;
+    UINT16              copied;
+    BYTE                out[MAX_SYM_BLOCK_SIZE];
+    UINT32              outSize = sizeof(out);
+    UINT16              blocksize;
+    int                 i;
+    TPMU_PUBLIC_PARMS   cmac_keyParms;
+
+    // initializing this statically seems impossible with gcc...
+    cmac_keyParms.symDetail.sym.algorithm = ALG_AES_VALUE;
+    cmac_keyParms.symDetail.sym.keyBits.sym = 128;
+
+    for (i = 0; CMACTests[i].key; i++ )
+	{
+	    blocksize = CryptCmacStart(&state, &cmac_keyParms,
+				       TPM_ALG_CMAC, CMACTests[i].key);
+	    pAssert(blocksize <= outSize);
+	    CryptCmacData(&state.state, CMACTests[i].datalen,
+			  CMACTests[i].data);
+	    copied = CryptCmacEnd(&state.state, outSize, out);
+	    if((CMACTests[i].outlen != copied)
+	      || (memcmp(out, CMACTests[i].out, CMACTests[i].outlen) != 0)) {
+		SELF_TEST_FAILURE;
+	    }
+	}
+    return TPM_RC_SUCCESS;
+}
+#endif
+// libtpms added end
 /* 10.2.1.4 Symmetric Test Functions */
 /* 10.2.1.4.1 MakeIv() */
 /* Internal function to make the appropriate IV depending on the mode. */
@@ -811,6 +847,15 @@ TestAlgorithm(
 		    // Symmetric block ciphers
 #if ALG_AES
 		  case ALG_AES_VALUE:
+// libtpms added begin
+#if ALG_CMAC
+		    if (doTest) {
+		         result = TestCMAC(toTest);
+		         if (result != TPM_RC_SUCCESS)
+		             break;
+	            }
+#endif
+// libtpms added end
 #endif
 #if ALG_SM4
 		    // if SM4 is implemented, its test is like other block ciphers but there
diff --git a/src/tpm2/HashTestData.h b/src/tpm2/HashTestData.h
index 9dd3ce00..d13843a5 100644
--- a/src/tpm2/HashTestData.h
+++ b/src/tpm2/HashTestData.h
@@ -127,5 +127,65 @@ TPM2B_SHA512    c_SHA512_digest = {{64, {
 	}}};
 #endif
 
+// libtpms added begin
+#if ALG_CMAC
+TPM2B_TYPE(AES128, 16);
+static TPM2B_AES128 cmac_aeskey = {{16, {
+    0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
+    0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c
+}}};
+static const struct CMACTest {
+    TPM2B             *key;
+    const BYTE         data[64];
+    UINT32             datalen;
+    const BYTE         out[16];
+    UINT16             outlen;
+} CMACTests[] = {
+    {
+        .key      = &cmac_aeskey.b,
+        .data     = { },
+        .datalen  = 0,
+        .out      = { 0xbb, 0x1d, 0x69, 0x29, 0xe9, 0x59, 0x37, 0x28,
+                      0x7f, 0xa3, 0x7d, 0x12, 0x9b, 0x75, 0x67, 0x46},
+        .outlen   = 16,
+    }, {
+        .key      = &cmac_aeskey.b,
+        .data     = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+                      0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a},
+        .datalen  = 16,
+        .out      = { 0x07, 0x0a, 0x16, 0xb4, 0x6b, 0x4d, 0x41, 0x44,
+                      0xf7, 0x9b, 0xdd, 0x9d, 0xd0, 0x4a, 0x28, 0x7c},
+        .outlen   = 16,
+    }, {
+        .key      = &cmac_aeskey.b,
+        .data     = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+                      0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
+                      0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
+                      0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51,
+                      0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11},
+        .datalen  = 40,
+        .out      = { 0xdf, 0xa6, 0x67, 0x47, 0xde, 0x9a, 0xe6, 0x30,
+                      0x30, 0xca, 0x32, 0x61, 0x14, 0x97, 0xc8, 0x27},
+        .outlen   = 16,
+    }, {
+        .key      = &cmac_aeskey.b,
+        .data     = { 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96,
+                      0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a,
+                      0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c,
+                      0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51,
+                      0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11,
+                      0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef,
+                      0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17,
+                      0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10},
+        .datalen  = 64,
+        .out      = { 0x51, 0xf0, 0xbe, 0xbf, 0x7e, 0x3b, 0x9d, 0x92,
+                      0xfc, 0x49, 0x74, 0x17, 0x79, 0x36, 0x3c, 0xfe},
+        .outlen   = 16,
+    }, {
+        .key      = NULL,
+    }
+};
+#endif
+// libtpms added end
 
 #endif