CR50: add support for 4k RSA verify

Add support for verifying messages signed
with 4096-bit RSA keys.  Such messages may
be generated by host side applications.

Also update tpmtest.py to test 4k verification.

BRANCH=none
BUG=none
TEST=added new tests to tpmtest.py; TCG tests pass

Change-Id: I7450bd710c154c68c030ce176bfe7becbfbcb729
Signed-off-by: nagendra modadugu <ngm@google.com>
Reviewed-on: https://chromium-review.googlesource.com/428220
Commit-Ready: Nagendra Modadugu <ngm@google.com>
Tested-by: Marius Schilder <mschilder@chromium.org>
Tested-by: Nagendra Modadugu <ngm@google.com>
Reviewed-by: Marius Schilder <mschilder@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>

1 files changed, 98 insertions, 17 deletions

diff --git a/board/cr50/tpm2/rsa.c b/board/cr50/tpm2/rsa.c
index 9cc1d9ed7f..52507c985f 100644
--- a/board/cr50/tpm2/rsa.c
+++ b/board/cr50/tpm2/rsa.c
@@ -472,7 +472,14 @@ enum {
 	TEST_X509_VERIFY = 7,
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_768_N = {
+/* Test support for RSA 2k (signing / encryption) and RSA 4k
+ * (verification) without changing the default value for
+ * MAX_RSA_KEY_BYTES (which corresponds to RSA 2k) in
+ * tpm2/tpm_types.h.
+ */
+TPM2B_BYTE_VALUE(512);
+
+static const TPM2B_512_BYTE_VALUE RSA_768_N = {
 	.t = {96, {
 			0xb0, 0xdb, 0xed, 0x46, 0xd9, 0x32, 0xf0, 0x7c,
 			0xd4, 0x20, 0x23, 0xd2, 0x35, 0x5a, 0x86, 0x17,
@@ -490,7 +497,7 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_768_N = {
 	}
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_768_D = {
+static const TPM2B_512_BYTE_VALUE RSA_768_D = {
 	.t = {96, {
 			0xae, 0xad, 0xb9, 0x50, 0x25, 0x8c, 0x1b, 0x5c,
 			0x9f, 0x42, 0xd3, 0x3e, 0x76, 0x75, 0xdf, 0x45,
@@ -508,7 +515,7 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_768_D = {
 	}
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_768_P = {
+static const TPM2B_512_BYTE_VALUE RSA_768_P = {
 	.t = {48, {
 			0xd6, 0x09, 0x64, 0xc8, 0xf3, 0x5c, 0x02, 0xc7,
 			0xc6, 0x47, 0x4e, 0x7f, 0x43, 0x9d, 0x31, 0x46,
@@ -520,7 +527,7 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_768_P = {
 	}
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_768_Q = {
+static const TPM2B_512_BYTE_VALUE RSA_768_Q = {
 	.t = {48, {
 			0xd3, 0x88, 0x92, 0x2d, 0xd5, 0xc6, 0x29, 0xf4,
 			0xf0, 0x2e, 0x61, 0xf0, 0x60, 0xad, 0xa9, 0x46,
@@ -532,7 +539,7 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_768_Q = {
 	}
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_1024_N = {
+static const TPM2B_512_BYTE_VALUE RSA_1024_N = {
 	.t = {128, {
 			0xdf, 0x4e, 0xaf, 0x73, 0x45, 0x94, 0x98, 0x34,
 			0x30, 0x7e, 0x26, 0xad, 0x40, 0x83, 0xf9, 0x17,
@@ -554,7 +561,7 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_1024_N = {
 	}
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_1024_D = {
+static const TPM2B_512_BYTE_VALUE RSA_1024_D = {
 	.t = {128, {
 			0x9a, 0x6d, 0x85, 0xf4, 0x07, 0xa8, 0x6d, 0x61,
 			0x9a, 0x2f, 0x83, 0x7b, 0xc8, 0xe3, 0xfb, 0x7c,
@@ -576,7 +583,7 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_1024_D = {
 	}
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_1024_P = {
+static const TPM2B_512_BYTE_VALUE RSA_1024_P = {
 	.t = {64, {
 			0xf9, 0x5e, 0x79, 0x65, 0x43, 0x70, 0x40, 0x83,
 			0x50, 0x0a, 0xbb, 0x61, 0xb3, 0x87, 0x7b, 0x24,
@@ -590,7 +597,7 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_1024_P = {
 	}
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_1024_Q = {
+static const TPM2B_512_BYTE_VALUE RSA_1024_Q = {
 	.t = {64, {
 			0xe5, 0x3e, 0xcd, 0x4b, 0x97, 0xc5, 0x96, 0x39,
 			0x70, 0x97, 0x3a, 0x10, 0xa9, 0xc3, 0x35, 0x0a,
@@ -604,7 +611,7 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_1024_Q = {
 	}
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_2048_N = {
+static const TPM2B_512_BYTE_VALUE RSA_2048_N = {
 	.t = {256, {
 			0x9c, 0xd7, 0x61, 0x2e, 0x43, 0x8e, 0x15, 0xbe,
 			0xcd, 0x73, 0x9f, 0xb7, 0xf5, 0x86, 0x4b, 0xe3,
@@ -754,7 +761,7 @@ static const uint8_t RSA_2048_CERT[] = {
 	0x57
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_2048_D = {
+static const TPM2B_512_BYTE_VALUE RSA_2048_D = {
 	.t  = {256, {
 			0x4e, 0x9d, 0x02, 0x1f, 0xdf, 0x4a, 0x8b, 0x89,
 			0xbc, 0x8f, 0x14, 0xe2, 0x6f, 0x15, 0x66, 0x5a,
@@ -792,7 +799,7 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_2048_D = {
 	}
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_2048_P = {
+static const TPM2B_512_BYTE_VALUE RSA_2048_P = {
 	.t  = {128, {
 			0xc8, 0x80, 0x6f, 0xf6, 0x2f, 0xfb, 0x49, 0x8b,
 			0x77, 0x39, 0xe2, 0x3d, 0x3d, 0x1f, 0x4d, 0xf9,
@@ -814,7 +821,7 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_2048_P = {
 	}
 };
 
-static const TPM2B_PUBLIC_KEY_RSA RSA_2048_Q = {
+static const TPM2B_512_BYTE_VALUE RSA_2048_Q = {
 	.t  = {128, {
 			0xc8, 0x41, 0x2a, 0x42, 0xf1, 0x6a, 0x81, 0xac,
 			0x06, 0xab, 0xd0, 0xb7, 0xc0, 0xbb, 0xc6, 0x13,
@@ -836,7 +843,77 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_2048_Q = {
 	}
 };
 
-#define MAX_MSG_BYTES RSA_MAX_BYTES
+static const TPM2B_512_BYTE_VALUE RSA_4096_N = {
+	.t  = {512, {
+			0xB4, 0xD2, 0xAB, 0x9C, 0xFA, 0x42, 0x9A, 0x37,
+			0x70, 0x2A, 0xE4, 0x2D, 0x87, 0x67, 0x7F, 0x15,
+			0xB6, 0x31, 0x06, 0x06, 0xD5, 0x5A, 0xE9, 0x8E,
+			0xA9, 0xD4, 0x6D, 0x6B, 0x92, 0xB9, 0x63, 0x37,
+			0x7D, 0x9C, 0xF0, 0xCA, 0x0A, 0x44, 0x19, 0xF0,
+			0x71, 0xA7, 0x4C, 0xE0, 0x90, 0x9C, 0xBE, 0x69,
+			0x4A, 0x9C, 0x55, 0x18, 0xB3, 0x42, 0x43, 0xD9,
+			0x6C, 0x65, 0xFD, 0xD1, 0xCF, 0x20, 0x0C, 0x92,
+			0x34, 0x27, 0x46, 0x48, 0x58, 0x0B, 0x13, 0xCD,
+			0xF1, 0x67, 0x70, 0x02, 0x7E, 0xE7, 0x4C, 0xA9,
+			0xD8, 0xFD, 0x48, 0x17, 0x80, 0xF6, 0x01, 0x0E,
+			0x61, 0xB0, 0xBE, 0xEF, 0x87, 0x2B, 0x71, 0x0E,
+			0x65, 0x81, 0xC1, 0x50, 0xCE, 0xB8, 0x65, 0xD2,
+			0xD7, 0xFA, 0x76, 0xC4, 0xB7, 0x13, 0xD9, 0xED,
+			0xDA, 0xD6, 0x9F, 0x9E, 0x10, 0xB2, 0x50, 0xF4,
+			0xFD, 0xF4, 0xF9, 0xEC, 0xD8, 0x33, 0x56, 0xEF,
+			0xF4, 0x22, 0xD3, 0xC2, 0xBA, 0x49, 0xD5, 0xA9,
+			0x0B, 0xB0, 0x18, 0xA3, 0xD9, 0x26, 0xCD, 0x27,
+			0x76, 0x6A, 0x72, 0x1B, 0x31, 0xAC, 0x3D, 0x42,
+			0xE8, 0xD9, 0x26, 0xD3, 0x90, 0xBB, 0x39, 0x64,
+			0xBB, 0xEA, 0x89, 0x0B, 0x7A, 0xB4, 0x88, 0x39,
+			0xEA, 0xE9, 0xCA, 0x19, 0x8C, 0x42, 0xFB, 0x69,
+			0x22, 0xCA, 0x8E, 0xBD, 0x6C, 0x73, 0xB7, 0x88,
+			0xA0, 0xA1, 0x19, 0xA8, 0xFA, 0x94, 0x55, 0x20,
+			0x6F, 0x80, 0xBA, 0xD7, 0x69, 0x12, 0x1F, 0x74,
+			0x82, 0xEC, 0xAF, 0xEE, 0x28, 0xAF, 0xCD, 0xDA,
+			0xAD, 0x1B, 0x5B, 0x54, 0xE4, 0x2B, 0xEF, 0x0C,
+			0x4D, 0xD1, 0xAB, 0xD7, 0x03, 0xC4, 0xA4, 0x99,
+			0xA0, 0xBC, 0x7E, 0x9D, 0x3C, 0x2F, 0x34, 0x3B,
+			0xD5, 0xDD, 0x6A, 0xED, 0xA6, 0x19, 0x93, 0x83,
+			0xBE, 0xE2, 0xD4, 0x6F, 0x92, 0xFF, 0x55, 0xA7,
+			0xF7, 0x67, 0xEB, 0xE3, 0x46, 0xD3, 0xE7, 0x6D,
+			0xC0, 0x29, 0x95, 0x2B, 0xBF, 0xDD, 0xB4, 0x93,
+			0xBB, 0x45, 0x01, 0xFC, 0x53, 0x21, 0xCE, 0x9F,
+			0x8B, 0x90, 0x80, 0x09, 0xBA, 0x1A, 0x6E, 0x08,
+			0x87, 0x15, 0xB4, 0x74, 0xA3, 0xDC, 0xBB, 0xDB,
+			0x45, 0xF2, 0x38, 0x20, 0x85, 0xC3, 0x9E, 0x4A,
+			0x45, 0x1E, 0x75, 0x18, 0x05, 0x42, 0x86, 0xAD,
+			0x47, 0xE6, 0xAA, 0xED, 0x88, 0x9A, 0x9F, 0x37,
+			0xA3, 0xB8, 0xC7, 0x99, 0x35, 0xE2, 0xA8, 0x8E,
+			0x9D, 0x2E, 0xBC, 0xF2, 0x64, 0x48, 0xC3, 0x63,
+			0x4F, 0x1C, 0xD0, 0x45, 0xC3, 0x41, 0xA1, 0xBE,
+			0xE5, 0xC2, 0xA4, 0x5D, 0x45, 0xF0, 0x03, 0x83,
+			0xC9, 0x80, 0x4C, 0x68, 0xF0, 0xD1, 0xDA, 0xF1,
+			0x51, 0x81, 0xD5, 0xFE, 0xC4, 0xE8, 0x8A, 0xD6,
+			0x32, 0x95, 0x38, 0xD8, 0x3B, 0xDA, 0xF7, 0x8C,
+			0x5C, 0x6B, 0x01, 0xF4, 0x6E, 0x12, 0xB5, 0xB6,
+			0x36, 0xE3, 0xD1, 0xAA, 0x49, 0x44, 0x6A, 0xF3,
+			0xE6, 0x7B, 0x19, 0x7D, 0xF8, 0x35, 0xCB, 0x2D,
+			0xB8, 0x62, 0x54, 0xCF, 0x2D, 0x66, 0xB3, 0x7F,
+			0xE0, 0x37, 0x65, 0x19, 0x82, 0xD6, 0x88, 0x24,
+			0xC2, 0x31, 0x7E, 0x1F, 0x6E, 0xDA, 0x4B, 0x28,
+			0xAF, 0x5E, 0x2B, 0xE8, 0x34, 0xB2, 0xDC, 0xC7,
+			0xD1, 0x95, 0x0C, 0x94, 0xE7, 0x09, 0xA0, 0xED,
+			0xAA, 0x91, 0x2F, 0x91, 0x6F, 0xF0, 0x00, 0xDF,
+			0x0D, 0x46, 0xEF, 0xD2, 0x59, 0x7B, 0x65, 0xCE,
+			0xA2, 0xED, 0x8A, 0xE2, 0x1E, 0xD0, 0xE1, 0x93,
+			0x72, 0x7F, 0x18, 0x79, 0x18, 0x35, 0xF3, 0xCA,
+			0xDB, 0x01, 0x5F, 0x09, 0x48, 0x21, 0x45, 0xFE,
+			0x89, 0x44, 0xED, 0x07, 0x79, 0x68, 0x32, 0xD8,
+			0xD6, 0x8B, 0xA0, 0xC6, 0xDC, 0xF9, 0x56, 0x89,
+			0x5B, 0xCE, 0x35, 0x05, 0xE9, 0xC1, 0x4A, 0x1E,
+			0x24, 0x0B, 0xC8, 0x73, 0x18, 0x19, 0x6B, 0xED,
+			0xF9, 0x3E, 0x92, 0x92, 0xF2, 0x0B, 0x75, 0x25,
+		}
+	}
+};
+
+#define MAX_MSG_BYTES 512
 #define MAX_LABEL_LEN 32
 
 /* 128-byte buffer to hold entropy for generating a
@@ -858,10 +935,10 @@ static void rsa_command_handler(void *cmd_body,
 	uint16_t digest_len;
 	uint8_t digest[SHA_DIGEST_MAX_BYTES];
 	uint8_t *out = (uint8_t *) cmd_body;
-	TPM2B_PUBLIC_KEY_RSA N;
-	TPM2B_PUBLIC_KEY_RSA d;
-	TPM2B_PUBLIC_KEY_RSA p;
-	TPM2B_PUBLIC_KEY_RSA q;
+	TPM2B_512_BYTE_VALUE N;
+	TPM2B_512_BYTE_VALUE d;
+	TPM2B_512_BYTE_VALUE p;
+	TPM2B_512_BYTE_VALUE q;
 	RSA_KEY key;
 	uint32_t *response_size = (uint32_t *) response_size_out;
 	TPM2B_PUBLIC_KEY_RSA rsa_d;
@@ -942,6 +1019,10 @@ static void rsa_command_handler(void *cmd_body,
 		rsa_n.b.size = RSA_2048_N.b.size;
 		rsa_d.b.size = RSA_2048_D.b.size;
 		break;
+	case 4096:
+		N = RSA_4096_N;
+		rsa_n.b.size = RSA_4096_N.b.size;
+		break;
 	default:
 		*response_size = 0;
 		return;