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

Fix merge issues with ECC HAVE_COMP_KEY after rebase.

Browse Source
This commit is contained in:
David Garske
2016-12-16 14:20:00 -08:00
parent f990775451
commit 57571cb45e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/ecc.c
View File

@@ -941,6 +941,10 @@ const ecc_set_type ecc_sets[] = {
static oid_cache_t ecc_oid_cache[ECC_SET_COUNT]; static oid_cache_t ecc_oid_cache[ECC_SET_COUNT];
#endif #endif
#ifdef HAVE_COMP_KEY
static int wc_ecc_export_x963_compressed(ecc_key*, byte* out, word32* outLen);
#endif
#ifdef ECC_CACHE_CURVE #ifdef ECC_CACHE_CURVE
/* cache (mp_int) of the curve parameters */ /* cache (mp_int) of the curve parameters */
static ecc_curve_spec ecc_curve_spec_cache[ECC_SET_COUNT]; static ecc_curve_spec ecc_curve_spec_cache[ECC_SET_COUNT];
@@ -4310,6 +4314,7 @@ int wc_ecc_import_x963_ex(const byte* in, word32 inLen, ecc_key* key,
if (err == MP_OKAY && compressed == 1) { /* build y */ if (err == MP_OKAY && compressed == 1) { /* build y */
DECLARE_CURVE_SPECS DECLARE_CURVE_SPECS
mp_int t1, t2; mp_int t1, t2;
int did_init = 0;
if (mp_init_multi(&t1, &t2, NULL, NULL, NULL, NULL) != MP_OKAY) if (mp_init_multi(&t1, &t2, NULL, NULL, NULL, NULL) != MP_OKAY)
err = MEMORY_E; err = MEMORY_E;
@@ -4356,9 +4361,10 @@ int wc_ecc_import_x963_ex(const byte* in, word32 inLen, ecc_key* key,
if (did_init) { if (did_init) {
#ifndef USE_FAST_MATH #ifndef USE_FAST_MATH
mp_clear(&t2); mp_clear(&t2);
mp_clear(&t1); mp_clear(&t1);
#endif #endif
}
wc_ecc_curve_free(curve); wc_ecc_curve_free(curve);
} }