wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4535 from kareem-wolfssl/zd13165

Browse Source 
Fix building with NO_ECC_KEY_EXPORT.
This commit is contained in:
David Garske
2021-11-08 11:11:53 -08:00
committed by GitHub
parent 67a11df15b 60a86157c7
commit 478f57b347
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tls.c
View File

@ -6486,7 +6486,7 @@ static int TLSX_KeyShare_GenX448Key(WOLFSSL *ssl, KeyShareEntry* kse)
static int TLSX_KeyShare_GenEccKey(WOLFSSL *ssl, KeyShareEntry* kse) static int TLSX_KeyShare_GenEccKey(WOLFSSL *ssl, KeyShareEntry* kse)
{ {
int ret = 0; int ret = 0;
#ifdef HAVE_ECC #if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT)
word32 keySize = 0; word32 keySize = 0;
word16 curveId = ECC_CURVE_INVALID; word16 curveId = ECC_CURVE_INVALID;
ecc_key* eccKey = (ecc_key*)kse->key; ecc_key* eccKey = (ecc_key*)kse->key;
@ -6611,7 +6611,7 @@ static int TLSX_KeyShare_GenEccKey(WOLFSSL *ssl, KeyShareEntry* kse)
(void)kse; (void)kse;
ret = NOT_COMPILED_IN; ret = NOT_COMPILED_IN;
#endif /* HAVE_ECC */ #endif /* HAVE_ECC && HAVE_ECC_KEY_EXPORT */
return ret; return ret;
} }

2
tests/api.c
View File

@ -26334,7 +26334,7 @@ static int test_ToTraditional (void)
static int test_wc_EccPrivateKeyToDer (void) static int test_wc_EccPrivateKeyToDer (void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && !defined(WC_NO_RNG) #if defined(HAVE_ECC) && defined(HAVE_ECC_KEY_EXPORT) && !defined(WC_NO_RNG)
byte output[ONEK_BUF]; byte output[ONEK_BUF];
ecc_key eccKey; ecc_key eccKey;

2
wolfcrypt/test/test.c
View File

@ -21468,9 +21468,7 @@ static int ecc_test_make_pub(WC_RNG* rng)
byte tmp[ECC_BUFSIZE]; byte tmp[ECC_BUFSIZE];
#endif #endif
const byte* msg = (const byte*)"test wolfSSL ECC public gen"; const byte* msg = (const byte*)"test wolfSSL ECC public gen";
#if defined(HAVE_ECC_KEY_EXPORT)
word32 x; word32 x;
#endif
word32 tmpSz; word32 tmpSz;
int ret = 0; int ret = 0;
ecc_point* pubPoint = NULL; ecc_point* pubPoint = NULL;