wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-05 13:44:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1459 from cconlon/selftest_fixes

Browse Source 
Fix for wolfCrypt test and CAVP selftest build
This commit is contained in:
toddouska
2018-03-27 13:27:28 -07:00
committed by GitHub
parent 9f231e0020 021560035b
commit 504b13530e
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/asn.c
View File

@@ -1208,7 +1208,9 @@ static const byte extCertPolicyOid[] = {85, 29, 32};
static const byte extKeyUsageOid[] = {85, 29, 15}; static const byte extKeyUsageOid[] = {85, 29, 15};
static const byte extInhibitAnyOid[] = {85, 29, 54}; static const byte extInhibitAnyOid[] = {85, 29, 54};
static const byte extExtKeyUsageOid[] = {85, 29, 37}; static const byte extExtKeyUsageOid[] = {85, 29, 37};
static const byte extNameConsOid[] = {85, 29, 30}; #ifndef IGNORE_NAME_CONSTRAINTS
static const byte extNameConsOid[] = {85, 29, 30};
#endif
/* certAuthInfoType */ /* certAuthInfoType */
#ifdef HAVE_OCSP #ifdef HAVE_OCSP

4
wolfcrypt/test/test.c
View File

@@ -14566,12 +14566,14 @@ static int ecc_exp_imp_test(ecc_key* key)
goto done; goto done;
} }
#ifndef HAVE_SELFTEST
/* test import of public */ /* test import of public */
ret = wc_ecc_import_unsigned(&keyImp, pub, &pub[32], NULL, ECC_SECP256R1); ret = wc_ecc_import_unsigned(&keyImp, pub, &pub[32], NULL, ECC_SECP256R1);
if (ret != 0) { if (ret != 0) {
ret = -6638; ret = -6638;
goto done; goto done;
} }
#endif
wc_ecc_free(&keyImp); wc_ecc_free(&keyImp);
wc_ecc_init(&keyImp); wc_ecc_init(&keyImp);
@@ -14585,12 +14587,14 @@ static int ecc_exp_imp_test(ecc_key* key)
goto done; goto done;
} }
#ifndef HAVE_SELFTEST
/* test import of private and public */ /* test import of private and public */
ret = wc_ecc_import_unsigned(&keyImp, pub, &pub[32], priv, ECC_SECP256R1); ret = wc_ecc_import_unsigned(&keyImp, pub, &pub[32], priv, ECC_SECP256R1);
if (ret != 0) { if (ret != 0) {
ret = -6640; ret = -6640;
goto done; goto done;
} }
#endif
done: done:
wc_ecc_free(&keyImp); wc_ecc_free(&keyImp);