wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4057 from SparkiDev/no_tls12_pkcb

Browse Source 
TLS: fix build with no TLSv12 but PK callbacks
This commit is contained in:
David Garske
2021-05-25 15:26:40 -07:00
committed by GitHub
parent 3cc69ee6a0 6747055d46
commit 41af3da0e3
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/internal.c
View File

@ -3692,7 +3692,8 @@ static word32 MacSize(WOLFSSL* ssl)
#endif /* HAVE_ENCRYPT_THEN_MAC && !WOLFSSL_AEAD_ONLY */ #endif /* HAVE_ENCRYPT_THEN_MAC && !WOLFSSL_AEAD_ONLY */
#ifndef NO_RSA #ifndef NO_RSA
#ifndef WOLFSSL_NO_TLS12 #if !defined(WOLFSSL_NO_TLS12) || \
(defined(WC_RSA_PSS) && defined(HAVE_PK_CALLBACKS))
#if !defined(NO_WOLFSSL_SERVER) || !defined(NO_WOLFSSL_CLIENT) #if !defined(NO_WOLFSSL_SERVER) || !defined(NO_WOLFSSL_CLIENT)
static int TypeHash(int hashAlgo) static int TypeHash(int hashAlgo)
{ {

6
tests/api.c
View File

@ -40242,7 +40242,8 @@ static int test_tls13_apis(void)
#endif #endif
#ifdef HAVE_PK_CALLBACKS #if defined(HAVE_PK_CALLBACKS) && (!defined(WOLFSSL_NO_TLS12) || \
!defined(NO_OLD_TLS))
#if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \ #if !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && !defined(NO_RSA) && \
!defined(NO_WOLFSSL_CLIENT) && !defined(NO_DH) && !defined(NO_AES) && \ !defined(NO_WOLFSSL_CLIENT) && !defined(NO_DH) && !defined(NO_AES) && \
defined(HAVE_IO_TESTS_DEPENDENCIES) && !defined(SINGLE_THREADED) defined(HAVE_IO_TESTS_DEPENDENCIES) && !defined(SINGLE_THREADED)
@ -43754,7 +43755,8 @@ void ApiTest(void)
AssertIntEQ(test_RsaSigFailure_cm(), ASN_SIG_CONFIRM_E); AssertIntEQ(test_RsaSigFailure_cm(), ASN_SIG_CONFIRM_E);
#endif /* NO_CERTS */ #endif /* NO_CERTS */
#ifdef HAVE_PK_CALLBACKS #if defined(HAVE_PK_CALLBACKS) && (!defined(WOLFSSL_NO_TLS12) || \
!defined(NO_OLD_TLS))
/* public key callback tests */ /* public key callback tests */
test_DhCallbacks(); test_DhCallbacks();
#endif #endif