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

Merge pull request #1453 from dgarske/ecc508a_linux

Browse Source 
Support for building with `WOLFSSL_ATECC508A` on other targets
This commit is contained in:
toddouska
2018-03-27 09:57:39 -07:00
committed by GitHub
parent c08f5b86cf 0cff2f8b10
commit 9f231e0020
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wolfcrypt/src/ecc.c
View File

@@ -3271,9 +3271,12 @@ int wc_ecc_make_key_ex(WC_RNG* rng, int keysize, ecc_key* key, int curve_id)
} }
/* populate key->pubkey */ /* populate key->pubkey */
err = mp_read_unsigned_bin(key->pubkey.x, key->pubkey_raw, 32); err = mp_read_unsigned_bin(key->pubkey.x, key->pubkey_raw,
ECC_MAX_CRYPTO_HW_SIZE);
if (err = MP_OKAY) if (err = MP_OKAY)
err = mp_read_unsigned_bin(key->pubkey.y, key->pubkey_raw + 32, 32); err = mp_read_unsigned_bin(key->pubkey.y,
key->pubkey_raw + ECC_MAX_CRYPTO_HW_SIZE,
ECC_MAX_CRYPTO_HW_SIZE);
#else #else
#ifdef WOLFSSL_HAVE_SP_ECC #ifdef WOLFSSL_HAVE_SP_ECC
@@ -4616,7 +4619,7 @@ int wc_ecc_import_point_der(byte* in, word32 inLen, const int curve_idx,
#ifdef WOLFSSL_ATECC508A #ifdef WOLFSSL_ATECC508A
/* populate key->pubkey_raw */ /* populate key->pubkey_raw */
XMEMCPY(key->pubkey_raw, (byte*)in, PUB_KEY_SIZE); XMEMCPY(key->pubkey_raw, (byte*)in, sizeof(key->pubkey_raw));
#endif #endif
/* read data */ /* read data */

10
wolfcrypt/src/port/atmel/atmel.c
View File

@@ -25,18 +25,20 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#ifdef WOLFSSL_ATMEL #if defined(WOLFSSL_ATMEL) || defined(WOLFSSL_ATECC508A)
#include <wolfssl/wolfcrypt/memory.h> #include <wolfssl/wolfcrypt/memory.h>
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
#include <wolfssl/ssl.h> #include <wolfssl/ssl.h>
#include <wolfssl/internal.h> #include <wolfssl/internal.h>
#ifdef WOLFSSL_ATMEL
#define Aes Aes_Remap #define Aes Aes_Remap
#define Gmac Gmac_Remap #define Gmac Gmac_Remap
#include "asf.h" #include "asf.h"
#undef Aes #undef Aes
#undef Gmac #undef Gmac
#endif /* WOLFSSL_ATMEL */
#include <wolfssl/wolfcrypt/port/atmel/atmel.h> #include <wolfssl/wolfcrypt/port/atmel/atmel.h>
@@ -102,16 +104,20 @@ int atmel_get_random_block(unsigned char* output, unsigned int sz)
return atmel_get_random_number((uint32_t)sz, (uint8_t*)output); return atmel_get_random_number((uint32_t)sz, (uint8_t*)output);
} }
#ifdef WOLFSSL_ATMEL
extern struct rtc_module *_rtc_instance[RTC_INST_NUM]; extern struct rtc_module *_rtc_instance[RTC_INST_NUM];
#endif
long atmel_get_curr_time_and_date(long* tm) long atmel_get_curr_time_and_date(long* tm)
{ {
(void)tm; (void)tm;
#ifdef WOLFSSL_ATMEL
/* Get current time */ /* Get current time */
//struct rtc_calendar_time rtcTime; //struct rtc_calendar_time rtcTime;
//rtc_calendar_get_time(_rtc_instance[0], &rtcTime); //rtc_calendar_get_time(_rtc_instance[0], &rtcTime);
/* Convert rtc_calendar_time to seconds since UTC */ /* Convert rtc_calendar_time to seconds since UTC */
#endif
return 0; return 0;
} }
@@ -241,4 +247,4 @@ void atmel_init(void)
} }
} }
#endif /* WOLFSSL_ATMEL */ #endif /* WOLFSSL_ATMEL || WOLFSSL_ATECC508A */

4
wolfcrypt/src/wc_port.c
View File

@@ -46,7 +46,7 @@
#include <wolfssl/wolfcrypt/port/nxp/ksdk_port.h> #include <wolfssl/wolfcrypt/port/nxp/ksdk_port.h>
#endif #endif
#ifdef WOLFSSL_ATMEL #if defined(WOLFSSL_ATMEL) || defined(WOLFSSL_ATECC508A)
#include <wolfssl/wolfcrypt/port/atmel/atmel.h> #include <wolfssl/wolfcrypt/port/atmel/atmel.h>
#endif #endif
@@ -129,7 +129,7 @@ int wolfCrypt_Init(void)
} }
#endif #endif
#ifdef WOLFSSL_ATMEL #if defined(WOLFSSL_ATMEL) || defined(WOLFSSL_ATECC508A)
atmel_init(); atmel_init();
#endif #endif

3
wolfssl/wolfcrypt/ecc.h
View File

@@ -122,6 +122,7 @@ enum {
/* max crypto hardware size */ /* max crypto hardware size */
#ifdef WOLFSSL_ATECC508A #ifdef WOLFSSL_ATECC508A
ECC_MAX_CRYPTO_HW_SIZE = ATECC_KEY_SIZE, /* from port/atmel/atmel.h */ ECC_MAX_CRYPTO_HW_SIZE = ATECC_KEY_SIZE, /* from port/atmel/atmel.h */
ECC_MAX_CRYPTO_HW_PUBKEY_SIZE = (ATECC_KEY_SIZE*2)
#elif defined(PLUTON_CRYPTO_ECC) #elif defined(PLUTON_CRYPTO_ECC)
ECC_MAX_CRYPTO_HW_SIZE = 32, ECC_MAX_CRYPTO_HW_SIZE = 32,
#endif #endif
@@ -316,7 +317,7 @@ struct ecc_key {
mp_int k; /* private key */ mp_int k; /* private key */
#ifdef WOLFSSL_ATECC508A #ifdef WOLFSSL_ATECC508A
int slot; /* Key Slot Number (-1 unknown) */ int slot; /* Key Slot Number (-1 unknown) */
byte pubkey_raw[PUB_KEY_SIZE]; byte pubkey_raw[ECC_MAX_CRYPTO_HW_PUBKEY_SIZE];
#endif #endif
#ifdef PLUTON_CRYPTO_ECC #ifdef PLUTON_CRYPTO_ECC
int devId; int devId;