From a457bac2404d125726831e1b55fe6c80b41eecd6 Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Wed, 26 Feb 2020 12:31:27 -0500 Subject: Merge branch 'modexpng' to 'master' --- ks.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'ks.c') diff --git a/ks.c b/ks.c index 0e6b4ec..72bb0fe 100644 --- a/ks.c +++ b/ks.c @@ -41,13 +41,6 @@ #include "hal_internal.h" #include "ks.h" -#ifdef DO_TIMING -#include "stm-dwt.h" -#else -#define DWT_start(x) -#define DWT_stop(x) -#endif - /* * PIN block gets the all-zeros UUID, which will never be returned by * the UUID generation code (by definition -- it's not a version 4 UUID). @@ -676,13 +669,8 @@ hal_error_t hal_ks_fetch(hal_ks_t *ks, *der_len = der_max; - DWT_start(DWT_hal_mkm_get_kek); - if ((err = hal_mkm_get_kek(kek, &kek_len, sizeof(kek))) == HAL_OK) { - DWT_stop(DWT_hal_mkm_get_kek); - DWT_start(DWT_hal_aes_keyunwrap); + if ((err = hal_mkm_get_kek(kek, &kek_len, sizeof(kek))) == HAL_OK) err = hal_aes_keyunwrap(NULL, kek, kek_len, der, k_der_len, der, der_len); - DWT_stop(DWT_hal_aes_keyunwrap); - } memset(kek, 0, sizeof(kek)); } -- cgit v1.2.3