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 #8151 from SparkiDev/test_fixes_3

Browse Source 
Testing fixes
This commit is contained in:
David Garske
2024-11-07 12:43:12 -08:00
committed by GitHub
parent 79d9aab5bd 256c6708e0
commit 364cd107ff
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pk.c
View File

@ -16526,6 +16526,7 @@ int pkcs8_encode(WOLFSSL_EVP_PKEY* pkey, byte* key, word32* keySz)
curveOid = NULL; curveOid = NULL;
oidSz = 0; oidSz = 0;
} }
#ifndef NO_DH
else if (pkey->type == WC_EVP_PKEY_DH) { else if (pkey->type == WC_EVP_PKEY_DH) {
if (pkey->dh == NULL) if (pkey->dh == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -16548,6 +16549,7 @@ int pkcs8_encode(WOLFSSL_EVP_PKEY* pkey, byte* key, word32* keySz)
curveOid = NULL; curveOid = NULL;
oidSz = 0; oidSz = 0;
} }
#endif
else { else {
ret = NOT_COMPILED_IN; ret = NOT_COMPILED_IN;
} }

4
tests/quic.c
View File

@ -19,11 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
#ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#include <tests/unit.h> #include <tests/unit.h>

3
tests/unit.h
View File

@ -27,11 +27,10 @@
#include <config.h> #include <config.h>
#endif #endif
#include <wolfssl/wolfcrypt/settings.h>
#ifndef WOLFSSL_USER_SETTINGS #ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h> #include <wolfssl/options.h>
#endif #endif
#include <wolfssl/wolfcrypt/settings.h>
#undef TEST_OPENSSL_COEXIST /* can't use this option with unit tests */ #undef TEST_OPENSSL_COEXIST /* can't use this option with unit tests */
#undef OPENSSL_COEXIST /* can't use this option with unit tests */ #undef OPENSSL_COEXIST /* can't use this option with unit tests */