mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6986 from douzzer/20231119-all-cryptonly-opensslextra

Browse Source 
20231119-all-cryptonly-opensslextra
This commit is contained in:
JacobBarthelmeh 2023-11-20 15:29:14 -07:00 committed by GitHub
commit 665469f02a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -798,7 +798,7 @@ then
if test "$ENABLED_LINUXKM_DEFAULTS" != "yes" if test "$ENABLED_LINUXKM_DEFAULTS" != "yes"
then then
test "$enable_compkey" = "" && enable_compkey=yes test "$enable_compkey" = "" && enable_compkey=yes
test "$enable_quic" = "" && enable_quic=yes test "$enable_quic" = "" && test "$enable_cryptonly" != "yes" && enable_quic=yes
AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_IO -DHAVE_IO_TIMEOUT" AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_IO -DHAVE_IO_TIMEOUT"
fi fi

4
linuxkm/module_exports.c.template
View File

@ -151,12 +151,14 @@
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
#ifndef WOLFCRYPT_ONLY #ifndef WOLFCRYPT_ONLY
#include <wolfssl/openssl/evp.h> #include <wolfssl/openssl/evp.h>
#endif #endif
#include <wolfssl/openssl/rand.h> #include <wolfssl/openssl/rand.h>
#include <wolfssl/openssl/hmac.h> #include <wolfssl/openssl/hmac.h>
#include <wolfssl/openssl/aes.h> #include <wolfssl/openssl/aes.h>
#include <wolfssl/openssl/des.h> #include <wolfssl/openssl/des.h>
#include <wolfssl/openssl/modes.h>
#include <wolfssl/openssl/rc4.h>
#endif #endif
#if defined(NO_FILESYSTEM) #if defined(NO_FILESYSTEM)

4
src/ssl_crypto.c
View File

@ -2061,7 +2061,7 @@ size_t wolfSSL_HMAC_size(const WOLFSSL_HMAC_CTX* ctx)
* START OF CMAC API * START OF CMAC API
******************************************************************************/ ******************************************************************************/
#ifdef OPENSSL_EXTRA #if defined(OPENSSL_EXTRA) && !defined(WOLFCRYPT_ONLY)
#if defined(WOLFSSL_CMAC) && defined(OPENSSL_EXTRA) && \ #if defined(WOLFSSL_CMAC) && defined(OPENSSL_EXTRA) && \
defined(WOLFSSL_AES_DIRECT) defined(WOLFSSL_AES_DIRECT)
/* Allocate a new CMAC context object. /* Allocate a new CMAC context object.
@ -2275,7 +2275,7 @@ int wolfSSL_CMAC_Final(WOLFSSL_CMAC_CTX* ctx, unsigned char* out, size_t* len)
return ret; return ret;
} }
#endif /* WOLFSSL_CMAC && OPENSSL_EXTRA && WOLFSSL_AES_DIRECT */ #endif /* WOLFSSL_CMAC && OPENSSL_EXTRA && WOLFSSL_AES_DIRECT */
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA && !WOLFCRYPT_ONLY */
/******************************************************************************* /*******************************************************************************
* END OF CMAC API * END OF CMAC API