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

fix for selftest build

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-10-23 12:09:20 -06:00
parent 48c4b2fedc
commit 5b9e005802
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wolfcrypt/src/asn.c
View File

@ -10652,7 +10652,17 @@ static int SetEccPublicKey(byte* output, ecc_key* key, int with_header)
return MEMORY_E; return MEMORY_E;
#endif #endif
#ifdef HAVE_SELFTEST
/* older version of ecc.c can not handle dp being NULL */
if (key != NULL && key->dp == NULL) {
ret = BAD_FUNC_ARG;
}
else {
ret = wc_ecc_export_x963(key, pub, &pubSz);
}
#else
ret = wc_ecc_export_x963(key, pub, &pubSz); ret = wc_ecc_export_x963(key, pub, &pubSz);
#endif
if (ret != 0) { if (ret != 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(pub, key->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(pub, key->heap, DYNAMIC_TYPE_TMP_BUFFER);
@ -10749,7 +10759,19 @@ int wc_EccPublicKeyToDer(ecc_key* key, byte* output, word32 inLen,
infoSz += TRAILING_ZERO; infoSz += TRAILING_ZERO;
} }
if ((ret = wc_ecc_export_x963(key, NULL, &keySz)) != LENGTH_ONLY_E) { #ifdef HAVE_SELFTEST
/* older version of ecc.c can not handle dp being NULL */
if (key != NULL && key->dp == NULL) {
keySz = 1 + 2 * MAX_ECC_BYTES;
ret = LENGTH_ONLY_E;
}
else {
ret = wc_ecc_export_x963(key, NULL, &keySz);
}
#else
ret = wc_ecc_export_x963(key, NULL, &keySz);
#endif
if (ret != LENGTH_ONLY_E) {
WOLFSSL_MSG("Error in getting ECC public key size"); WOLFSSL_MSG("Error in getting ECC public key size");
return ret; return ret;
} }