From 6d778fa5e9e5da407cbd3cd81293742abd4ea906 Mon Sep 17 00:00:00 2001 From: Conor Patrick Date: Sat, 2 Jun 2018 19:36:03 -0400 Subject: [PATCH] start replacing sf crypto with hw crypto --- ctap.c | 10 +- nrf52840/Makefile | 9 +- nrf52840/crypto.c | 373 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 388 insertions(+), 4 deletions(-) create mode 100644 nrf52840/crypto.c diff --git a/ctap.c b/ctap.c index a0ebaea..60e4cbf 100644 --- a/ctap.c +++ b/ctap.c @@ -11,6 +11,7 @@ #include "crypto.h" #include "util.h" #include "log.h" +#include "device.h" #define PIN_TOKEN_SIZE 16 @@ -1084,10 +1085,11 @@ uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp) CborEncoder encoder; uint8_t status = 0; uint8_t cmd = *pkt_raw; + uint64_t t1; + uint64_t t2; pkt_raw++; length--; - uint8_t * buf = resp->data; cbor_encoder_init(&encoder, buf, resp->data_size, 0); @@ -1112,7 +1114,10 @@ uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp) { case CTAP_MAKE_CREDENTIAL: printf1(TAG_CTAP,"CTAP_MAKE_CREDENTIAL\n"); + t1 = millis(); status = ctap_make_credential(&encoder, pkt_raw, length); + t2 = millis(); + printf1(TAG_TIME,"make_credential time: %d ms\n", t2-t1); dump_hex1(TAG_DUMP, buf, cbor_encoder_get_buffer_size(&encoder, buf)); @@ -1120,7 +1125,10 @@ uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp) break; case CTAP_GET_ASSERTION: printf1(TAG_CTAP,"CTAP_GET_ASSERTION\n"); + t1 = millis(); status = ctap_get_assertion(&encoder, pkt_raw, length); + t2 = millis(); + printf1(TAG_TIME,"get_assertion time: %d ms\n", t2-t1); resp->length = cbor_encoder_get_buffer_size(&encoder, buf); diff --git a/nrf52840/Makefile b/nrf52840/Makefile index e0ea1f6..0548251 100644 --- a/nrf52840/Makefile +++ b/nrf52840/Makefile @@ -23,7 +23,7 @@ SRC_FILES += \ $(PROJ_DIR)/../ctap_parse.c \ $(PROJ_DIR)/../u2f.c \ \ - $(PROJ_DIR)/../crypto.c \ + $(PROJ_DIR)/crypto.c \ $(PROJ_DIR)/../crypto/sha256.c \ $(PROJ_DIR)/../crypto/tiny-AES-c/aes.c \ $(PROJ_DIR)/../crypto/micro-ecc/uECC.c \ @@ -147,9 +147,12 @@ INC_FOLDERS += \ $(SDK_ROOT)/modules/nrfx/drivers/include \ $(SDK_ROOT)/modules/nrfx/hal \ $(SDK_ROOT)/external/fprintf \ + $(SDK_ROOT)/external/nrf_cc310/include \ + $(SDK_ROOT)/external/nrf_cc310/common \ # Libraries common to all targets -LIB_FILES += \ +LIB_FILES += $(SDK_ROOT)/external/nrf_cc310/lib/libnrf_cc310_0.9.9.a \ + $(PROJ_DIR)/../tinycbor/lib/libtinycbor.a # Optimization flags OPT = -O3 -g3 @@ -207,7 +210,7 @@ nrf52840_xxaa: ASMFLAGS += -D__STACK_SIZE=8192 # Add standard libraries at the very end of the linker input, after all objects # that may need symbols provided by these libraries. -LIB_FILES += -lc -lnosys -lm $(PROJ_DIR)/../tinycbor/lib/libtinycbor.a +LIB_FILES += -lc -lnosys -lm .PHONY: default help diff --git a/nrf52840/crypto.c b/nrf52840/crypto.c new file mode 100644 index 0000000..8633077 --- /dev/null +++ b/nrf52840/crypto.c @@ -0,0 +1,373 @@ +/* + * Wrapper for crypto implementation on device + * + * */ +#include +#include +#include + +#include "util.h" +#include "crypto.h" + +#include "sha256.h" +#include "uECC.h" +#include "aes.h" +#include "ctap.h" + +#include "ssi_pal_types.h" +#include "ssi_pal_mem.h" +#include "sns_silib.h" +#include "crys_ecpki_build.h" +#include "crys_ecpki_ecdsa.h" +#include "crys_ecpki_dh.h" +#include "crys_ecpki_kg.h" +#include "crys_ecpki_domain.h" +#include "crys_rnd.h" +#include "nrf52840.h" + + +const uint8_t attestation_cert_der[]; +const uint16_t attestation_cert_der_size; +const uint8_t attestation_key[]; +const uint16_t attestation_key_size; + + + +static SHA256_CTX sha256_ctx; +const CRYS_ECPKI_Domain_t* _es256_curve; +CRYS_RND_State_t rndState_ptr; +CRYS_RND_WorkBuff_t rndWorkBuff_ptr; + + + + +static const uint8_t * _signing_key = NULL; + +// Secrets for testing only +static uint8_t master_secret[32] = "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff" + "\xff\xee\xdd\xcc\xbb\xaa\x99\x88\x77\x66\x55\x44\x33\x22\x11\x00"; + +static uint8_t transport_secret[32] = "\x10\x01\x22\x33\x44\x55\x66\x77\x87\x90\x0a\xbb\x3c\xd8\xee\xff" + "\xff\xee\x8d\x1c\x3b\xfa\x99\x88\x77\x86\x55\x44\xd3\xff\x33\x00"; + + + +void crypto_sha256_init() +{ + sha256_init(&sha256_ctx); +} + +void crypto_reset_master_secret() +{ + ctap_generate_rng(master_secret, 32); +} + + +void crypto_sha256_update(uint8_t * data, size_t len) +{ + sha256_update(&sha256_ctx, data, len); +} + +void crypto_sha256_update_secret() +{ + sha256_update(&sha256_ctx, master_secret, 32); +} + +void crypto_sha256_final(uint8_t * hash) +{ + sha256_final(&sha256_ctx, hash); +} + +void crypto_sha256_hmac_init(uint8_t * key, uint32_t klen, uint8_t * hmac) +{ + uint8_t buf[64]; + int i; + memset(buf, 0, sizeof(buf)); + + if (key == CRYPTO_MASTER_KEY) + { + key = master_secret; + klen = sizeof(master_secret); + } + + if(klen > 64) + { + printf("Error, key size must be <= 64\n"); + exit(1); + } + + memmove(buf, key, klen); + + for (i = 0; i < sizeof(buf); i++) + { + buf[i] = buf[i] ^ 0x36; + } + + crypto_sha256_init(); + crypto_sha256_update(buf, 64); +} + +void crypto_sha256_hmac_final(uint8_t * key, uint32_t klen, uint8_t * hmac) +{ + uint8_t buf[64]; + int i; + crypto_sha256_final(hmac); + memset(buf, 0, sizeof(buf)); + if (key == CRYPTO_MASTER_KEY) + { + key = master_secret; + klen = sizeof(master_secret); + } + + + if(klen > 64) + { + printf("Error, key size must be <= 64\n"); + exit(1); + } + memmove(buf, key, klen); + + for (i = 0; i < sizeof(buf); i++) + { + buf[i] = buf[i] ^ 0x5c; + } + + crypto_sha256_init(); + crypto_sha256_update(buf, 64); + crypto_sha256_update(hmac, 32); + crypto_sha256_final(hmac); +} + + +void crypto_ecc256_init() +{ + int ret; + NVIC_EnableIRQ(CRYPTOCELL_IRQn); + NRF_CRYPTOCELL->ENABLE = 1; + + ret = SaSi_LibInit(); + if (ret != SA_SILIB_RET_OK) { + printf("Failed SaSi_LibInit - ret = 0x%x\n", ret); + switch(ret) + { + case SA_SILIB_RET_OK: + printf("SA_SILIB_RET_OK\n"); + break; + + case SA_SILIB_RET_EINVAL_CTX_PTR: + printf("SA_SILIB_RET_EINVAL_CTX_PTR\n"); + break; + + case SA_SILIB_RET_EINVAL_WORK_BUF_PTR: + printf("SA_SILIB_RET_EINVAL_WORK_BUF_PTR\n"); + break; + + case SA_SILIB_RET_HAL: + printf("SA_SILIB_RET_HAL\n"); + break; + + case SA_SILIB_RET_PAL: + printf("SA_SILIB_RET_PAL\n"); + break; + + case SA_SILIB_RET_EINVAL_HW_VERSION : + printf("SA_SILIB_RET_EINVAL_HW_VERSION \n"); + break; + + case SA_SILIB_RET_EINVAL_HW_SIGNATURE: + printf("SA_SILIB_RET_EINVAL_HW_SIGNATURE\n"); + break; + + case SA_SILIB_RESERVE32B: + printf("SA_SILIB_RESERVE32B\n"); + break; + } + exit(1); + } + + memset(&rndState_ptr, 0, sizeof(CRYS_RND_State_t)); + memset(&rndWorkBuff_ptr, 0, sizeof(CRYS_RND_WorkBuff_t)); + + + ret = CRYS_RndInit(&rndState_ptr, &rndWorkBuff_ptr); + if (ret != SA_SILIB_RET_OK) { + printf("Failed CRYS_RndInit - ret = 0x%x\n", ret); + while(1) + ; + } + + _es256_curve = CRYS_ECPKI_GetEcDomain(CRYS_ECPKI_DomainID_secp256r1); + + // + uECC_set_rng((uECC_RNG_Function)ctap_generate_rng); + // +} + + +void crypto_ecc256_load_attestation_key() +{ + _signing_key = attestation_key; +} + +void crypto_ecc256_sign(uint8_t * data, int len, uint8_t * sig) +{ + CRYS_ECPKI_UserPrivKey_t UserPrivKey; + CRYS_ECDSA_SignUserContext_t SignUserContext; + uint32_t sigsz = 64; + int ret = CRYS_ECPKI_BuildPrivKey(_es256_curve, + _signing_key, + 32, + &UserPrivKey); + + if (ret != SA_SILIB_RET_OK){ + printf(" CRYS_ECPKI_BuildPrivKey failed with 0x%x \n",ret); + exit(1); + } + + ret = CRYS_ECDSA_Sign(&rndState_ptr, + CRYS_RND_GenerateVector, + &SignUserContext, + &UserPrivKey, + CRYS_ECPKI_AFTER_HASH_SHA256_mode, + data, + len, + sig, + &sigsz); + + if (ret != SA_SILIB_RET_OK){ + printf(" CRYS_ECDSA_Sign failed with 0x%x \n",ret); + exit(1); + } +} + + +/*int uECC_compute_public_key(const uint8_t *private_key, uint8_t *public_key, uECC_Curve curve);*/ +void crypto_ecc256_derive_public_key(uint8_t * data, int len, uint8_t * x, uint8_t * y) +{ + uint8_t privkey[32]; + uint8_t pubkey[64]; + + generate_private_key(data,len,NULL,0,privkey); + + memset(pubkey,0,sizeof(pubkey)); + uECC_compute_public_key(privkey, pubkey, uECC_secp256r1()); + memmove(x,pubkey,32); + memmove(y,pubkey+32,32); +} + +void crypto_ecc256_load_key(uint8_t * data, int len, uint8_t * data2, int len2) +{ + static uint8_t privkey[32]; + generate_private_key(data,len,data2,len2,privkey); + _signing_key = privkey; +} + +void crypto_ecc256_make_key_pair(uint8_t * pubkey, uint8_t * privkey) +{ + if (uECC_make_key(pubkey, privkey, uECC_secp256r1()) != 1) + { + printf("Error, uECC_make_key failed\n"); + exit(1); + } +} + +void crypto_ecc256_shared_secret(const uint8_t * pubkey, const uint8_t * privkey, uint8_t * shared_secret) +{ + if (uECC_shared_secret(pubkey, privkey, shared_secret, uECC_secp256r1()) != 1) + { + printf("Error, uECC_shared_secret failed\n"); + exit(1); + } + +} + +void generate_private_key(uint8_t * data, int len, uint8_t * data2, int len2, uint8_t * privkey) +{ + crypto_sha256_hmac_init(CRYPTO_MASTER_KEY, 0, privkey); + crypto_sha256_update(data, len); + crypto_sha256_update(data2, len2); + crypto_sha256_update(master_secret, 32); + crypto_sha256_hmac_final(CRYPTO_MASTER_KEY, 0, privkey); +} + +struct AES_ctx aes_ctx; +void crypto_aes256_init(uint8_t * key, uint8_t * nonce) +{ + if (key == CRYPTO_TRANSPORT_KEY) + { + AES_init_ctx(&aes_ctx, transport_secret); + } + else + { + AES_init_ctx(&aes_ctx, key); + } + if (nonce == NULL) + { + memset(aes_ctx.Iv, 0, 16); + } + else + { + memmove(aes_ctx.Iv, nonce, 16); + } +} + +// prevent round key recomputation +void crypto_aes256_reset_iv(uint8_t * nonce) +{ + if (nonce == NULL) + { + memset(aes_ctx.Iv, 0, 16); + } + else + { + memmove(aes_ctx.Iv, nonce, 16); + } +} + +void crypto_aes256_decrypt(uint8_t * buf, int length) +{ + AES_CBC_decrypt_buffer(&aes_ctx, buf, length); +} + +void crypto_aes256_encrypt(uint8_t * buf, int length) +{ + AES_CBC_encrypt_buffer(&aes_ctx, buf, length); +} + + +const uint8_t attestation_cert_der[] = +"\x30\x82\x01\xfb\x30\x82\x01\xa1\xa0\x03\x02\x01\x02\x02\x01\x00\x30\x0a\x06\x08" +"\x2a\x86\x48\xce\x3d\x04\x03\x02\x30\x2c\x31\x0b\x30\x09\x06\x03\x55\x04\x06\x13" +"\x02\x55\x53\x31\x0b\x30\x09\x06\x03\x55\x04\x08\x0c\x02\x4d\x44\x31\x10\x30\x0e" +"\x06\x03\x55\x04\x0a\x0c\x07\x54\x45\x53\x54\x20\x43\x41\x30\x20\x17\x0d\x31\x38" +"\x30\x35\x31\x30\x30\x33\x30\x36\x32\x30\x5a\x18\x0f\x32\x30\x36\x38\x30\x34\x32" +"\x37\x30\x33\x30\x36\x32\x30\x5a\x30\x7c\x31\x0b\x30\x09\x06\x03\x55\x04\x06\x13" +"\x02\x55\x53\x31\x0b\x30\x09\x06\x03\x55\x04\x08\x0c\x02\x4d\x44\x31\x0f\x30\x0d" +"\x06\x03\x55\x04\x07\x0c\x06\x4c\x61\x75\x72\x65\x6c\x31\x15\x30\x13\x06\x03\x55" +"\x04\x0a\x0c\x0c\x54\x45\x53\x54\x20\x43\x4f\x4d\x50\x41\x4e\x59\x31\x22\x30\x20" +"\x06\x03\x55\x04\x0b\x0c\x19\x41\x75\x74\x68\x65\x6e\x74\x69\x63\x61\x74\x6f\x72" +"\x20\x41\x74\x74\x65\x73\x74\x61\x74\x69\x6f\x6e\x31\x14\x30\x12\x06\x03\x55\x04" +"\x03\x0c\x0b\x63\x6f\x6e\x6f\x72\x70\x70\x2e\x63\x6f\x6d\x30\x59\x30\x13\x06\x07" +"\x2a\x86\x48\xce\x3d\x02\x01\x06\x08\x2a\x86\x48\xce\x3d\x03\x01\x07\x03\x42\x00" +"\x04\x45\xa9\x02\xc1\x2e\x9c\x0a\x33\xfa\x3e\x84\x50\x4a\xb8\x02\xdc\x4d\xb9\xaf" +"\x15\xb1\xb6\x3a\xea\x8d\x3f\x03\x03\x55\x65\x7d\x70\x3f\xb4\x02\xa4\x97\xf4\x83" +"\xb8\xa6\xf9\x3c\xd0\x18\xad\x92\x0c\xb7\x8a\x5a\x3e\x14\x48\x92\xef\x08\xf8\xca" +"\xea\xfb\x32\xab\x20\xa3\x62\x30\x60\x30\x46\x06\x03\x55\x1d\x23\x04\x3f\x30\x3d" +"\xa1\x30\xa4\x2e\x30\x2c\x31\x0b\x30\x09\x06\x03\x55\x04\x06\x13\x02\x55\x53\x31" +"\x0b\x30\x09\x06\x03\x55\x04\x08\x0c\x02\x4d\x44\x31\x10\x30\x0e\x06\x03\x55\x04" +"\x0a\x0c\x07\x54\x45\x53\x54\x20\x43\x41\x82\x09\x00\xf7\xc9\xec\x89\xf2\x63\x94" +"\xd9\x30\x09\x06\x03\x55\x1d\x13\x04\x02\x30\x00\x30\x0b\x06\x03\x55\x1d\x0f\x04" +"\x04\x03\x02\x04\xf0\x30\x0a\x06\x08\x2a\x86\x48\xce\x3d\x04\x03\x02\x03\x48\x00" +"\x30\x45\x02\x20\x18\x38\xb0\x45\x03\x69\xaa\xa7\xb7\x38\x62\x01\xaf\x24\x97\x5e" +"\x7e\x74\x64\x1b\xa3\x7b\xf7\xe6\xd3\xaf\x79\x28\xdb\xdc\xa5\x88\x02\x21\x00\xcd" +"\x06\xf1\xe3\xab\x16\x21\x8e\xd8\xc0\x14\xaf\x09\x4f\x5b\x73\xef\x5e\x9e\x4b\xe7" +"\x35\xeb\xdd\x9b\x6d\x8f\x7d\xf3\xc4\x3a\xd7"; + + +const uint16_t attestation_cert_der_size = sizeof(attestation_cert_der)-1; + + +const uint8_t attestation_key[] = "\xcd\x67\xaa\x31\x0d\x09\x1e\xd1\x6e\x7e\x98\x92\xaa\x07\x0e\x19\x94\xfc\xd7\x14\xae\x7c\x40\x8f\xb9\x46\xb7\x2e\x5f\xe7\x5d\x30"; +const uint16_t attestation_key_size = sizeof(attestation_key)-1; + +