feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #3163 from dgarske/nrf52

Browse Source 
Fixes for building against latest nRF52 SDK
This commit is contained in:
toddouska
2020-08-03 16:33:49 -07:00
committed by GitHub
parent 3e84f1c53f 904241cba4
commit bfb4b2079b
6 changed files with 82 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/benchmark/benchmark.c
View File

@@ -5195,9 +5195,17 @@ void bench_ntruKeyGen(void)
#ifdef HAVE_ECC #ifdef HAVE_ECC
/* Default to testing P-256 */ /* Detect ECC key size to use */
#ifndef BENCH_ECC_SIZE #ifndef BENCH_ECC_SIZE
#ifndef NO_ECC256
#define BENCH_ECC_SIZE 32 #define BENCH_ECC_SIZE 32
#elif defined(HAVE_ECC384)
#define BENCH_ECC_SIZE 48
#elif defined(HAVE_ECC224)
#define BENCH_ECC_SIZE 28
#else
#error No ECC keygen size defined for benchmark
#endif
#endif #endif
static int bench_ecc_size = BENCH_ECC_SIZE; static int bench_ecc_size = BENCH_ECC_SIZE;

4
wolfcrypt/src/aes.c
View File

@@ -2391,6 +2391,7 @@ static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock)
aes->keylen = keylen; aes->keylen = keylen;
aes->rounds = keylen/4 + 6; aes->rounds = keylen/4 + 6;
XMEMCPY(aes->key, userKey, keylen);
ret = nrf51_aes_set_key(userKey); ret = nrf51_aes_set_key(userKey);
#if defined(WOLFSSL_AES_CFB) || defined(WOLFSSL_AES_COUNTER) || \ #if defined(WOLFSSL_AES_CFB) || defined(WOLFSSL_AES_COUNTER) || \
@@ -3999,9 +4000,6 @@ static WC_INLINE void IncCtr(byte* ctr, word32 ctrSz)
#if defined(HAVE_COLDFIRE_SEC) #if defined(HAVE_COLDFIRE_SEC)
#error "Coldfire SEC doesn't currently support AES-GCM mode" #error "Coldfire SEC doesn't currently support AES-GCM mode"
#elif defined(WOLFSSL_NRF51_AES)
#error "nRF51 doesn't currently support AES-GCM mode"
#endif #endif
#ifdef WOLFSSL_ARMASM #ifdef WOLFSSL_ARMASM

34
wolfcrypt/src/port/nrf51.c
View File

@@ -25,8 +25,9 @@
#endif #endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#include <wolfssl/wolfcrypt/types.h>
#ifdef WOLFSSL_NRF51 #if defined(WOLFSSL_NRF51) || defined(WOLFSSL_NRF5x)
#include "bsp.h" #include "bsp.h"
#include "nrf_delay.h" #include "nrf_delay.h"
@@ -50,7 +51,7 @@ const nrf_drv_rtc_t rtc = NRF_DRV_RTC_INSTANCE(0); /**< Declaring an instance of
#endif /* !NO_CRYPT_BENCHMARK */ #endif /* !NO_CRYPT_BENCHMARK */
/* AES */ /* AES */
#if !defined(NO_AES) && !defined(SOFTDEVICE_PRESENT) #if !defined(NO_AES) && defined(WOLFSSL_NRF51_AES) && !defined(SOFTDEVICE_PRESENT)
static byte mAesInitDone = 0; static byte mAesInitDone = 0;
#endif #endif
@@ -74,16 +75,14 @@ int nrf51_random_generate(byte* output, word32 size)
} }
while (remaining > 0) { while (remaining > 0) {
err_code = nrf_drv_rng_bytes_available(&available); available = 0;
if (err_code == NRF_SUCCESS) { nrf_drv_rng_bytes_available(&available); /* is void */
length = (remaining < available) ? remaining : available; length = (remaining < available) ? remaining : available;
if (length > 0) { if (length > 0) {
err_code = nrf_drv_rng_rand(&output[pos], length); err_code = nrf_drv_rng_rand(&output[pos], length);
remaining -= length; remaining -= length;
pos += length; pos += length;
} }
}
if (err_code != NRF_SUCCESS) { if (err_code != NRF_SUCCESS) {
break; break;
} }
@@ -166,28 +165,37 @@ static void rtc_handler(nrf_drv_rtc_int_type_t int_type)
} }
} }
#ifndef RTC0_CONFIG_FREQUENCY
#define RTC0_CONFIG_FREQUENCY 32768
#endif
static void rtc_config(void) static void rtc_config(void)
{ {
uint32_t err_code; uint32_t err_code;
// Start the internal LFCLK XTAL oscillator /* Start the internal LFCLK XTAL oscillator */
#if defined(NRF52) || defined(NRF52_SERIES)
err_code = nrf_drv_clock_init();
APP_ERROR_CHECK(err_code);
nrf_drv_clock_lfclk_request(NULL);
#else
err_code = nrf_drv_clock_init(NULL); err_code = nrf_drv_clock_init(NULL);
APP_ERROR_CHECK(err_code); APP_ERROR_CHECK(err_code);
nrf_drv_clock_lfclk_request(); nrf_drv_clock_lfclk_request();
#endif
// Initialize RTC instance /* Initialize RTC instance */
err_code = nrf_drv_rtc_init(&rtc, NULL, rtc_handler); err_code = nrf_drv_rtc_init(&rtc, NULL, rtc_handler);
APP_ERROR_CHECK(err_code); APP_ERROR_CHECK(err_code);
// Enable tick event /* Enable tick event */
nrf_drv_rtc_tick_enable(&rtc, false); nrf_drv_rtc_tick_enable(&rtc, false);
// Set compare channel to trigger interrupt after 1 seconds /* Set compare channel to trigger interrupt after 1 seconds */
err_code = nrf_drv_rtc_cc_set(&rtc, 0, RTC0_CONFIG_FREQUENCY, true); err_code = nrf_drv_rtc_cc_set(&rtc, 0, RTC0_CONFIG_FREQUENCY, true);
APP_ERROR_CHECK(err_code); APP_ERROR_CHECK(err_code);
// Power on RTC instance /* Power on RTC instance */
nrf_drv_rtc_enable(&rtc); nrf_drv_rtc_enable(&rtc);
} }
@@ -217,4 +225,4 @@ double current_time(int reset)
} }
#endif /* !NO_CRYPT_BENCHMARK */ #endif /* !NO_CRYPT_BENCHMARK */
#endif /* WOLFSSL_NRF51 */ #endif /* WOLFSSL_NRF51 || WOLFSSL_NRF5x */

26
wolfcrypt/src/random.c
View File

@@ -2124,37 +2124,43 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
return 0; return 0;
} }
#elif defined(WOLFSSL_NRF51) #elif defined(WOLFSSL_NRF51) || defined(WOLFSSL_NRF5x)
#include "app_error.h" #include "app_error.h"
#include "nrf_drv_rng.h" #include "nrf_drv_rng.h"
int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz) int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
{ {
int remaining = sz, length, pos = 0; int remaining = sz, length, pos = 0;
uint8_t available;
uint32_t err_code; uint32_t err_code;
uint8_t available;
static uint8_t initialized = 0;
(void)os; (void)os;
/* Make sure RNG is running */ /* Make sure RNG is running */
if (!initialized) {
err_code = nrf_drv_rng_init(NULL); err_code = nrf_drv_rng_init(NULL);
if (err_code != NRF_SUCCESS && err_code != NRF_ERROR_INVALID_STATE) { if (err_code != NRF_SUCCESS && err_code != NRF_ERROR_INVALID_STATE
#ifdef NRF_ERROR_MODULE_ALREADY_INITIALIZED
&& err_code != NRF_ERROR_MODULE_ALREADY_INITIALIZED
#endif
) {
return -1; return -1;
} }
initialized = 1;
}
while (remaining > 0) { while (remaining > 0) {
err_code = nrf_drv_rng_bytes_available(&available); available = 0;
if (err_code == NRF_SUCCESS) { nrf_drv_rng_bytes_available(&available); /* void func */
length = (remaining < available) ? remaining : available; length = (remaining < available) ? remaining : available;
if (length > 0) { if (length > 0) {
err_code = nrf_drv_rng_rand(&output[pos], length); err_code = nrf_drv_rng_rand(&output[pos], length);
remaining -= length;
pos += length;
}
}
if (err_code != NRF_SUCCESS) { if (err_code != NRF_SUCCESS) {
break; break;
} }
remaining -= length;
pos += length;
}
} }
return (err_code == NRF_SUCCESS) ? 0 : -1; return (err_code == NRF_SUCCESS) ? 0 : -1;

32
wolfcrypt/test/test.c
View File

@@ -344,7 +344,7 @@ int scrypt_test(void);
int ecc_encrypt_test(void); int ecc_encrypt_test(void);
#endif #endif
#if defined(USE_CERT_BUFFERS_256) && !defined(WOLFSSL_ATECC508A) && \ #if defined(USE_CERT_BUFFERS_256) && !defined(WOLFSSL_ATECC508A) && \
!defined(WOLFSSL_ATECC608A) !defined(WOLFSSL_ATECC608A) && !defined(NO_ECC256)
/* skip for ATECC508/608A, cannot import private key buffers */ /* skip for ATECC508/608A, cannot import private key buffers */
int ecc_test_buffers(void); int ecc_test_buffers(void);
#endif #endif
@@ -1016,7 +1016,7 @@ initDefaultName();
test_pass("ECC Enc test passed!\n"); test_pass("ECC Enc test passed!\n");
#endif #endif
#if defined(USE_CERT_BUFFERS_256) && !defined(WOLFSSL_ATECC508A) && \ #if defined(USE_CERT_BUFFERS_256) && !defined(WOLFSSL_ATECC508A) && \
!defined(WOLFSSL_ATECC608A) !defined(WOLFSSL_ATECC608A) && !defined(NO_ECC256)
/* skip for ATECC508/608A, cannot import private key buffers */ /* skip for ATECC508/608A, cannot import private key buffers */
if ( (ret = ecc_test_buffers()) != 0) if ( (ret = ecc_test_buffers()) != 0)
return err_sys("ECC buffer test failed!\n", ret); return err_sys("ECC buffer test failed!\n", ret);
@@ -8438,7 +8438,7 @@ int aesgcm_test(void)
0xba, 0x63, 0x7b, 0x39 0xba, 0x63, 0x7b, 0x39
}; };
#if defined(HAVE_AES_DECRYPT) || defined(WOLFSSL_AES_256) #if defined(WOLFSSL_AES_256)
const byte a[] = const byte a[] =
{ {
0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef, 0xfe, 0xed, 0xfa, 0xce, 0xde, 0xad, 0xbe, 0xef,
@@ -9014,7 +9014,7 @@ int gmac_test(void)
if (XMEMCMP(t2, tag, sizeof(t2)) != 0) if (XMEMCMP(t2, tag, sizeof(t2)) != 0)
return -6201; return -6201;
#if !(defined(WC_NO_RNG) || defined(HAVE_SELFTEST)) #if !defined(WC_NO_RNG) && !defined(HAVE_SELFTEST) && !defined(NO_AES_DECRYPT)
{ {
const byte badT[] = const byte badT[] =
{ {
@@ -9053,7 +9053,7 @@ int gmac_test(void)
return -6208; return -6208;
wc_FreeRng(&rng); wc_FreeRng(&rng);
} }
#endif /* WC_NO_RNG HAVE_SELFTEST */ #endif /* !WC_NO_RNG && !HAVE_SELFTEST && !NO_AES_DECRYPT */
#endif /* HAVE_FIPS */ #endif /* HAVE_FIPS */
return 0; return 0;
@@ -17802,9 +17802,17 @@ int x963kdf_test(void)
#ifdef HAVE_ECC #ifdef HAVE_ECC
/* size to use for ECC key gen tests */
#ifndef ECC_KEYGEN_SIZE #ifndef ECC_KEYGEN_SIZE
/* size to use for ECC key gen tests */ #ifndef NO_ECC256
#define ECC_KEYGEN_SIZE 32 #define ECC_KEYGEN_SIZE 32
#elif defined(HAVE_ECC384)
#define ECC_KEYGEN_SIZE 48
#elif defined(HAVE_ECC224)
#define ECC_KEYGEN_SIZE 28
#else
#error No ECC keygen size defined for test
#endif
#endif #endif
#ifdef BENCH_EMBEDDED #ifdef BENCH_EMBEDDED
#define ECC_SHARED_SIZE 128 #define ECC_SHARED_SIZE 128
@@ -18322,6 +18330,7 @@ static int ecc_test_make_pub(WC_RNG* rng)
wc_ecc_init_ex(&key, HEAP_HINT, devId); wc_ecc_init_ex(&key, HEAP_HINT, devId);
#ifndef NO_ECC256
#ifdef USE_CERT_BUFFERS_256 #ifdef USE_CERT_BUFFERS_256
XMEMCPY(tmp, ecc_key_der_256, (size_t)sizeof_ecc_key_der_256); XMEMCPY(tmp, ecc_key_der_256, (size_t)sizeof_ecc_key_der_256);
tmpSz = (size_t)sizeof_ecc_key_der_256; tmpSz = (size_t)sizeof_ecc_key_der_256;
@@ -18401,13 +18410,16 @@ static int ecc_test_make_pub(WC_RNG* rng)
ERROR_OUT(-9627, done); ERROR_OUT(-9627, done);
} }
#endif /* HAVE_ECC_KEY_EXPORT */ #endif /* HAVE_ECC_KEY_EXPORT */
#if defined(WOLFSSL_CRYPTOCELL) #endif /* !NO_ECC256 */
/* create a new key since building private key from public key is unsupported */
/* create a new key since above test for loading key is not supported */
#if defined(WOLFSSL_CRYPTOCELL) || defined(NO_ECC256)
ret = wc_ecc_make_key(rng, ECC_KEYGEN_SIZE, &key); ret = wc_ecc_make_key(rng, ECC_KEYGEN_SIZE, &key);
if (ret != 0) { if (ret != 0) {
ERROR_OUT(-9628, done); ERROR_OUT(-9628, done);
} }
#endif #endif
#ifdef HAVE_ECC_SIGN #ifdef HAVE_ECC_SIGN
tmpSz = sizeof(tmp); tmpSz = sizeof(tmp);
ret = 0; ret = 0;
@@ -20846,7 +20858,7 @@ done:
#endif /* HAVE_ECC_ENCRYPT */ #endif /* HAVE_ECC_ENCRYPT */
#if defined(USE_CERT_BUFFERS_256) && !defined(WOLFSSL_ATECC508A) && \ #if defined(USE_CERT_BUFFERS_256) && !defined(WOLFSSL_ATECC508A) && \
!defined(WOLFSSL_ATECC608A) !defined(WOLFSSL_ATECC608A) && !defined(NO_ECC256)
int ecc_test_buffers(void) { int ecc_test_buffers(void) {
size_t bytes; size_t bytes;
ecc_key cliKey; ecc_key cliKey;
@@ -20958,7 +20970,7 @@ int ecc_test_buffers(void) {
return 0; return 0;
} }
#endif /* USE_CERT_BUFFERS_256 */ #endif /* USE_CERT_BUFFERS_256 && !WOLFSSL_ATECCX08A && !NO_ECC256 */
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */

2
wolfssl/wolfcrypt/settings.h
View File

@@ -622,7 +622,6 @@
#ifdef WOLFSSL_NRF5x #ifdef WOLFSSL_NRF5x
#define SIZEOF_LONG 4 #define SIZEOF_LONG 4
#define SIZEOF_LONG_LONG 8 #define SIZEOF_LONG_LONG 8
#define NO_ASN_TIME
#define NO_DEV_RANDOM #define NO_DEV_RANDOM
#define NO_FILESYSTEM #define NO_FILESYSTEM
#define NO_MAIN_DRIVER #define NO_MAIN_DRIVER
@@ -630,7 +629,6 @@
#define SINGLE_THREADED #define SINGLE_THREADED
#define USE_FAST_MATH #define USE_FAST_MATH
#define TFM_TIMING_RESISTANT #define TFM_TIMING_RESISTANT
#define USE_WOLFSSL_MEMORY
#define WOLFSSL_NRF51 #define WOLFSSL_NRF51
#define WOLFSSL_USER_IO #define WOLFSSL_USER_IO
#define NO_SESSION_CACHE #define NO_SESSION_CACHE