summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/cr50/tpm2/rsa.c163
-rw-r--r--board/cr50/tpm2/stubs.c14
2 files changed, 162 insertions, 15 deletions
diff --git a/board/cr50/tpm2/rsa.c b/board/cr50/tpm2/rsa.c
index 2e7ccd8208..e48e4fb352 100644
--- a/board/cr50/tpm2/rsa.c
+++ b/board/cr50/tpm2/rsa.c
@@ -206,6 +206,51 @@ CRYPT_RESULT _cpri__ValidateSignatureRSA(
return CRYPT_FAIL;
}
+CRYPT_RESULT _cpri__TestKeyRSA(TPM2B *d_buf, uint32_t e,
+ TPM2B *N_buf, TPM2B *p_buf, TPM2B *q_buf)
+{
+ struct BIGNUM N;
+ struct BIGNUM p;
+ struct BIGNUM q;
+ struct BIGNUM d;
+ int result;
+
+ if (!p_buf)
+ return CRYPT_PARAMETER;
+ if (q_buf && p_buf->size != q_buf->size)
+ return CRYPT_PARAMETER;
+ if (N_buf->size != p_buf->size * 2)
+ return CRYPT_PARAMETER; /* Insufficient output buffer space. */
+ if (N_buf->size > RSA_MAX_BYTES)
+ return CRYPT_PARAMETER; /* Unsupported key size. */
+
+ DCRYPTO_bn_wrap(&N, N_buf->buffer, N_buf->size);
+ DCRYPTO_bn_wrap(&p, p_buf->buffer, p_buf->size);
+ reverse_tpm2b(N_buf);
+ reverse_tpm2b(p_buf);
+ if (q_buf) {
+ DCRYPTO_bn_wrap(&q, q_buf->buffer, q_buf->size);
+ reverse_tpm2b(q_buf);
+ }
+ /* d_buf->size may be uninitialized. */
+ DCRYPTO_bn_wrap(&d, d_buf->buffer, N_buf->size);
+
+ result = DCRYPTO_rsa_key_compute(&N, &d, &p, q_buf ? &q : NULL, e);
+
+ reverse_tpm2b(N_buf);
+ reverse_tpm2b(p_buf);
+ if (q_buf)
+ reverse_tpm2b(q_buf);
+
+ if (result) {
+ d_buf->size = N_buf->size;
+ reverse_tpm2b(d_buf);
+ return CRYPT_SUCCESS;
+ } else {
+ return CRYPT_FAIL;
+ }
+}
+
#ifdef CRYPTO_TEST_SETUP
#include "extension.h"
@@ -215,7 +260,8 @@ enum {
TEST_RSA_DECRYPT = 1,
TEST_RSA_SIGN = 2,
TEST_RSA_VERIFY = 3,
- TEST_RSA_KEYGEN = 4
+ TEST_RSA_KEYGEN = 4,
+ TEST_RSA_KEYTEST = 5
};
static const TPM2B_PUBLIC_KEY_RSA RSA_768_N = {
@@ -254,6 +300,30 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_768_D = {
}
};
+static const TPM2B_PUBLIC_KEY_RSA RSA_768_P = {
+ .t = {48, {
+ 0xd6, 0x09, 0x64, 0xc8, 0xf3, 0x5c, 0x02, 0xc7,
+ 0xc6, 0x47, 0x4e, 0x7f, 0x43, 0x9d, 0x31, 0x46,
+ 0x7a, 0x33, 0x85, 0xa0, 0xa4, 0x16, 0xea, 0x22,
+ 0x7b, 0xcd, 0x64, 0x9b, 0x50, 0xec, 0xa7, 0x2f,
+ 0x7e, 0xcf, 0xeb, 0x69, 0x29, 0x34, 0x8e, 0xb7,
+ 0xb5, 0xb3, 0xba, 0x7f, 0x9b, 0x01, 0x7d, 0x69
+ }
+ }
+};
+
+static const TPM2B_PUBLIC_KEY_RSA RSA_768_Q = {
+ .t = {48, {
+ 0xd3, 0x88, 0x92, 0x2d, 0xd5, 0xc6, 0x29, 0xf4,
+ 0xf0, 0x2e, 0x61, 0xf0, 0x60, 0xad, 0xa9, 0x46,
+ 0x11, 0xa9, 0x0c, 0x69, 0x14, 0x31, 0x09, 0x36,
+ 0x8b, 0x70, 0x1b, 0x11, 0x9b, 0x26, 0x39, 0x34,
+ 0x34, 0xfd, 0xf1, 0x9a, 0x89, 0x51, 0x63, 0x0a,
+ 0xc6, 0x60, 0x0b, 0xba, 0x18, 0x8e, 0xc8, 0x01
+ }
+ }
+};
+
static const TPM2B_PUBLIC_KEY_RSA RSA_2048_N = {
.t = {256, {
0x9c, 0xd7, 0x61, 0x2e, 0x43, 0x8e, 0x15, 0xbe,
@@ -330,6 +400,58 @@ static const TPM2B_PUBLIC_KEY_RSA RSA_2048_D = {
}
};
+static const TPM2B_PUBLIC_KEY_RSA RSA_2048_P = {
+ .t = {128, {
+ 0xc8, 0x80, 0x6f, 0xf6, 0x2f, 0xfb, 0x49, 0x8b,
+ 0x77, 0x39, 0xe2, 0x3d, 0x3d, 0x1f, 0x4d, 0xf9,
+ 0xbb, 0x54, 0x06, 0x0d, 0x71, 0xbf, 0x54, 0xb1,
+ 0x1e, 0xa2, 0x20, 0x7e, 0xdd, 0xcf, 0x21, 0x16,
+ 0xe9, 0xc0, 0xba, 0x94, 0x02, 0xd2, 0xa4, 0x2e,
+ 0x78, 0x3c, 0xfb, 0x64, 0xa0, 0xe7, 0xe9, 0x27,
+ 0x64, 0x29, 0x19, 0x74, 0xc5, 0x77, 0xbb, 0xe1,
+ 0x6d, 0xb4, 0x83, 0x1d, 0x43, 0x5a, 0x80, 0x72,
+ 0xec, 0x3c, 0x32, 0xc3, 0x20, 0x2c, 0xce, 0xf7,
+ 0xba, 0xf6, 0xc6, 0x0c, 0xf4, 0x56, 0xfd, 0xdf,
+ 0x21, 0x55, 0xf3, 0xe2, 0x56, 0x25, 0xa6, 0xb3,
+ 0x96, 0xa4, 0x9c, 0xb8, 0xfd, 0x9c, 0xec, 0x87,
+ 0xfa, 0xda, 0x2e, 0xa4, 0xf6, 0x0f, 0x14, 0xe6,
+ 0x81, 0x22, 0x84, 0xe7, 0xc0, 0x1d, 0xd1, 0x3f,
+ 0xed, 0xb0, 0xba, 0xd8, 0xe4, 0xe9, 0xd4, 0x18,
+ 0x33, 0xae, 0x29, 0x51, 0x79, 0x79, 0xd1, 0x0f
+ }
+ }
+};
+
+static const TPM2B_PUBLIC_KEY_RSA RSA_2048_Q = {
+ .t = {128, {
+ 0xc8, 0x41, 0x2a, 0x42, 0xf1, 0x6a, 0x81, 0xac,
+ 0x06, 0xab, 0xd0, 0xb7, 0xc0, 0xbb, 0xc6, 0x13,
+ 0xdd, 0xfd, 0x5e, 0x3c, 0x77, 0xfe, 0xc1, 0x2e,
+ 0x76, 0xf0, 0x94, 0xc0, 0x5d, 0x24, 0x8b, 0x30,
+ 0x0d, 0xf8, 0x2a, 0xc7, 0x26, 0x78, 0x1b, 0x81,
+ 0x5a, 0x42, 0x96, 0xad, 0xf7, 0x0e, 0xa4, 0x1b,
+ 0x2c, 0x8f, 0x38, 0x06, 0x05, 0x8d, 0x98, 0x6e,
+ 0x37, 0x65, 0xb4, 0x2c, 0x80, 0xe2, 0x38, 0xd5,
+ 0x79, 0xd2, 0xea, 0x62, 0xf2, 0x32, 0xac, 0x7b,
+ 0x88, 0x90, 0xc3, 0x4e, 0x9e, 0x53, 0xe5, 0x7e,
+ 0xef, 0x13, 0xb1, 0xe3, 0xd5, 0x41, 0xd1, 0xa9,
+ 0x15, 0x04, 0x3c, 0x61, 0x74, 0x5e, 0x1a, 0x00,
+ 0x5c, 0x8a, 0x8b, 0x17, 0xd5, 0x78, 0xad, 0x5e,
+ 0xe0, 0xcf, 0x35, 0x63, 0x0a, 0x95, 0x1e, 0x70,
+ 0xbe, 0x97, 0xf2, 0xd3, 0x78, 0x06, 0x8a, 0x88,
+ 0x9b, 0x27, 0xc8, 0xb2, 0xb1, 0x3d, 0x8a, 0xd7
+ }
+ }
+};
+
+
+static const RSA_KEY RSA_768 = {
+ 65537, (TPM2B *) &RSA_768_N.b, (TPM2B *) &RSA_768_D.b
+};
+static const RSA_KEY RSA_2048 = {
+ 65537, (TPM2B *) &RSA_2048_N.b, (TPM2B *) &RSA_2048_D.b
+};
+
#define MAX_MSG_BYTES RSA_MAX_BYTES
static void rsa_command_handler(void *cmd_body,
@@ -348,8 +470,12 @@ static void rsa_command_handler(void *cmd_body,
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;
RSA_KEY key;
uint32_t *response_size = (uint32_t *) response_size_out;
+ TPM2B_PUBLIC_KEY_RSA rsa_d;
+ TPM2B_PUBLIC_KEY_RSA rsa_n;
assert(sizeof(size_t) == sizeof(uint32_t));
@@ -397,10 +523,18 @@ static void rsa_command_handler(void *cmd_body,
case 768:
N = RSA_768_N;
d = RSA_768_D;
+ p = RSA_768_P;
+ q = RSA_768_Q;
+ rsa_n.b.size = RSA_768_N.b.size;
+ rsa_d.b.size = RSA_768_D.b.size;
break;
case 2048:
N = RSA_2048_N;
d = RSA_2048_D;
+ p = RSA_2048_P;
+ q = RSA_2048_Q;
+ rsa_n.b.size = RSA_2048_N.b.size;
+ rsa_d.b.size = RSA_2048_D.b.size;
break;
default:
*response_size = 0;
@@ -446,6 +580,33 @@ static void rsa_command_handler(void *cmd_body,
case TEST_RSA_KEYGEN:
*response_size = 0;
break;
+ case TEST_RSA_KEYTEST:
+ if (_cpri__TestKeyRSA(&rsa_d.b, 65537, &rsa_n.b, &p.b, &q.b)
+ != CRYPT_SUCCESS) {
+ *response_size = 0;
+ return;
+ }
+ if (memcmp(rsa_n.b.buffer, key.publicKey->buffer,
+ rsa_n.b.size) != 0 ||
+ memcmp(rsa_d.b.buffer, key.privateKey->buffer,
+ rsa_d.b.size) != 0) {
+ *response_size = 0;
+ return;
+ }
+
+ if (_cpri__TestKeyRSA(&rsa_d.b, 65537, key.publicKey,
+ &p.b, NULL) != CRYPT_SUCCESS) {
+ *response_size = 0;
+ return;
+ }
+ if (memcmp(rsa_d.b.buffer, key.privateKey->buffer,
+ rsa_d.b.size) != 0) {
+ *response_size = 0;
+ return;
+ }
+ *out = 1;
+ *response_size = 1;
+ return;
}
}
diff --git a/board/cr50/tpm2/stubs.c b/board/cr50/tpm2/stubs.c
index 56465f7eae..257889a652 100644
--- a/board/cr50/tpm2/stubs.c
+++ b/board/cr50/tpm2/stubs.c
@@ -81,20 +81,6 @@ BOOL _cpri__Startup(
return 1;
}
-CRYPT_RESULT _cpri__TestKeyRSA(
- TPM2B * d, // OUT: the address to receive the
- // private exponent
- UINT32 exponent, // IN: the public modulu
- TPM2B * publicKey, // IN/OUT: an input if only one prime is
- // provided. an output if both primes are provided
- TPM2B * prime1, // IN: a first prime
- TPM2B * prime2 // IN: an optional second prime
- )
-{
- ecprintf("%s called\n", __func__);
- return CRYPT_FAIL;
-}
-
CRYPT_RESULT _math__Div(
const TPM2B * n, // IN: numerator
const TPM2B * d, // IN: denominator
View Lorry Controller Status