From 7e0e512a5cf4a9114f7eed6e984523326d24bab3 Mon Sep 17 00:00:00 2001 From: David Garske Date: Tue, 20 Nov 2018 11:44:24 -0800 Subject: [PATCH] Minor build fixes for CryptoAuthLib with ATECC508A or ATECC608A. --- wolfcrypt/src/port/atmel/atmel.c | 2 ++ wolfssl/wolfcrypt/port/atmel/atmel.h | 5 ++++- wolfssl/wolfcrypt/wc_port.h | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wolfcrypt/src/port/atmel/atmel.c b/wolfcrypt/src/port/atmel/atmel.c index 6ef1b3487..e6a2ef92c 100644 --- a/wolfcrypt/src/port/atmel/atmel.c +++ b/wolfcrypt/src/port/atmel/atmel.c @@ -114,6 +114,8 @@ int atmel_get_random_block(unsigned char* output, unsigned int sz) } #if defined(WOLFSSL_ATMEL) && defined(WOLFSSL_ATMEL_TIME) +#include "asf.h" +#include "rtc_calendar.h" extern struct rtc_module *_rtc_instance[RTC_INST_NUM]; long atmel_get_curr_time_and_date(long* tm) diff --git a/wolfssl/wolfcrypt/port/atmel/atmel.h b/wolfssl/wolfcrypt/port/atmel/atmel.h index 9b5b1b858..ff771028c 100644 --- a/wolfssl/wolfcrypt/port/atmel/atmel.h +++ b/wolfssl/wolfcrypt/port/atmel/atmel.h @@ -72,7 +72,10 @@ struct ecc_key; int atmel_init(void); void atmel_finish(void); int atmel_get_random_number(uint32_t count, uint8_t* rand_out); -int atmel_get_random_block(unsigned char* output, unsigned int sz); +#ifndef ATMEL_GET_RANDOM_BLOCK_DEFINED + int atmel_get_random_block(unsigned char* output, unsigned int sz); + #define ATMEL_GET_RANDOM_BLOCK_DEFINED +#endif long atmel_get_curr_time_and_date(long* tm); #ifdef WOLFSSL_ATECC508A diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h index c612a24d9..587bc2231 100755 --- a/wolfssl/wolfcrypt/wc_port.h +++ b/wolfssl/wolfcrypt/wc_port.h @@ -439,8 +439,7 @@ WOLFSSL_API int wolfCrypt_Cleanup(void); #endif #define XGMTIME(c, t) gmtime((c)) -#elif defined(WOLFSSL_ATMEL) - extern long atmel_get_curr_time_and_date(long* tm); +#elif defined(WOLFSSL_ATMEL) && defined(WOLFSSL_ATMEL_TIME) #define XTIME(t1) atmel_get_curr_time_and_date((t1)) #define WOLFSSL_GMTIME #define USE_WOLF_TM