From 2fa1e19fe7a79839291231996768af521696e418 Mon Sep 17 00:00:00 2001 From: David Garske Date: Thu, 21 Apr 2022 13:28:38 -0700 Subject: [PATCH] Fix for `./configure --enable-sniffer --enable-session-ticket --disable-ecc && make`. --- scripts/sniffer-testsuite.test | 4 ++-- wolfcrypt/src/asn.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/sniffer-testsuite.test b/scripts/sniffer-testsuite.test index 80dfb8ad3..d0d520d74 100755 --- a/scripts/sniffer-testsuite.test +++ b/scripts/sniffer-testsuite.test @@ -32,10 +32,10 @@ has_ecc=no if [ $? -eq 0 ]; then has_ecc=yes fi -has_x22519=no +has_x25519=no ./sslSniffer/sslSnifferTest/snifftest -? 2>&1 | grep -- 'x22519 ' if [ $? -eq 0 ]; then - has_x22519=yes + has_x25519=yes fi has_dh=no ./sslSniffer/sslSnifferTest/snifftest -? 2>&1 | grep -- 'dh ' diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index 500b06d72..2654f6ba7 100644 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -3316,7 +3316,8 @@ int CheckBitString(const byte* input, word32* inOutIdx, int* len, (defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_KEY_GEN) || \ defined(OPENSSL_EXTRA))) || \ (defined(WC_ENABLE_ASYM_KEY_EXPORT) && !defined(NO_CERT)) || \ - (!defined(NO_DSA) && !defined(HAVE_SELFTEST) && defined(WOLFSSL_KEY_GEN)) + (!defined(NO_DSA) && !defined(HAVE_SELFTEST) && defined(WOLFSSL_KEY_GEN)) || \ + (!defined(NO_DH) && defined(WOLFSSL_DH_EXTRA)) /* Set the DER/BER encoding of the ASN.1 BIT STRING header. *