From c6e075f077a4d142fd3bbdbef70bb292e22beb8b Mon Sep 17 00:00:00 2001 From: David Garske Date: Mon, 30 Jul 2018 14:40:03 -0700 Subject: [PATCH] Fixes for building with Atmel ASF and no ECC508A. --- wolfcrypt/src/port/atmel/atmel.c | 7 +++++-- wolfssl/wolfcrypt/wc_port.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 wolfssl/wolfcrypt/wc_port.h diff --git a/wolfcrypt/src/port/atmel/atmel.c b/wolfcrypt/src/port/atmel/atmel.c index dc4a01fe3..c5e5d95af 100644 --- a/wolfcrypt/src/port/atmel/atmel.c +++ b/wolfcrypt/src/port/atmel/atmel.c @@ -104,15 +104,16 @@ int atmel_get_random_block(unsigned char* output, unsigned int sz) return atmel_get_random_number((uint32_t)sz, (uint8_t*)output); } -#ifdef WOLFSSL_ATMEL +#ifdef WOLFSSL_ATMEL_TIME extern struct rtc_module *_rtc_instance[RTC_INST_NUM]; #endif long atmel_get_curr_time_and_date(long* tm) { (void)tm; -#ifdef WOLFSSL_ATMEL +#ifdef WOLFSSL_ATMEL_TIME /* Get current time */ + //struct rtc_calendar_time rtcTime; //rtc_calendar_get_time(_rtc_instance[0], &rtcTime); @@ -250,7 +251,9 @@ void atmel_init(void) void atmel_finish(void) { if (mAtcaInitDone) { +#ifdef WOLFSSL_ATECC508A atcatls_finish(); +#endif mAtcaInitDone = 0; } } diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h old mode 100644 new mode 100755 index e5b6f2f58..5c6aa71e7 --- a/wolfssl/wolfcrypt/wc_port.h +++ b/wolfssl/wolfcrypt/wc_port.h @@ -436,6 +436,7 @@ WOLFSSL_API int wolfCrypt_Cleanup(void); #define XGMTIME(c, t) gmtime((c)) #elif defined(WOLFSSL_ATMEL) + extern long atmel_get_curr_time_and_date(long* tm); #define XTIME(t1) atmel_get_curr_time_and_date((t1)) #define WOLFSSL_GMTIME #define USE_WOLF_TM