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

Fixes for building with WOLFSSL_ATECC508A.

Browse Source
This commit is contained in:
David Garske
2017-08-22 13:11:20 -07:00
parent c25832ad14
commit 7c604bfc48
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wolfcrypt/src/ecc.c
View File

@@ -961,7 +961,9 @@ const ecc_set_type ecc_sets[] = {
static int wc_ecc_export_x963_compressed(ecc_key*, byte* out, word32* outLen); static int wc_ecc_export_x963_compressed(ecc_key*, byte* out, word32* outLen);
#endif #endif
#ifndef WOLFSSL_ATECC508A #ifdef WOLFSSL_ATECC508A
typedef void* ecc_curve_spec;
#else
static int ecc_check_pubkey_order(ecc_key* key, ecc_point* pubkey, mp_int* a, static int ecc_check_pubkey_order(ecc_key* key, ecc_point* pubkey, mp_int* a,
mp_int* prime, mp_int* order); mp_int* prime, mp_int* order);
@@ -3008,13 +3010,14 @@ static int wc_ecc_make_pub_ex(ecc_key* key, ecc_curve_spec* curveIn,
#ifndef WOLFSSL_ATECC508A #ifndef WOLFSSL_ATECC508A
ecc_point* base = NULL; ecc_point* base = NULL;
DECLARE_CURVE_SPECS(ECC_CURVE_FIELD_COUNT) DECLARE_CURVE_SPECS(ECC_CURVE_FIELD_COUNT)
#endif
ecc_point* pub; ecc_point* pub;
#endif
if (key == NULL) { if (key == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#ifndef WOLFSSL_ATECC508A
/* if ecc_point passed in then use it as output for public key point */ /* if ecc_point passed in then use it as output for public key point */
if (pubOut != NULL) { if (pubOut != NULL) {
pub = pubOut; pub = pubOut;
@@ -3090,6 +3093,8 @@ static int wc_ecc_make_pub_ex(ecc_key* key, ecc_curve_spec* curveIn,
wc_ecc_curve_free(curve); wc_ecc_curve_free(curve);
} }
#endif /* WOLFSSL_ATECC508A */
/* change key state if public part is cached */ /* change key state if public part is cached */
if (key->type == ECC_PRIVATEKEY_ONLY && pubOut == NULL) { if (key->type == ECC_PRIVATEKEY_ONLY && pubOut == NULL) {
key->type = ECC_PRIVATEKEY; key->type = ECC_PRIVATEKEY;