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

Merge pull request #7553 from JacobBarthelmeh/coexist

Browse Source 
error out if conflicting OPENSSL compat macros are defined
This commit is contained in:
David Garske
2024-05-17 12:56:59 -07:00
committed by GitHub
parent 15af87af8f 568ec43213
commit 2d5e8402e8
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wolfssl/wolfcrypt/settings.h
View File

@@ -3586,6 +3586,11 @@ extern void uITRON4_free(void *p) ;
#endif #endif
#endif #endif
#if (defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL)) && \
defined(OPENSSL_COEXIST)
#error "OPENSSL_EXTRA can not be defined with OPENSSL_COEXIST"
#endif
/* if configure.ac turned on this feature, HAVE_ENTROPY_MEMUSE will be set, /* if configure.ac turned on this feature, HAVE_ENTROPY_MEMUSE will be set,
* also define HAVE_WOLFENTROPY */ * also define HAVE_WOLFENTROPY */
#ifdef HAVE_ENTROPY_MEMUSE #ifdef HAVE_ENTROPY_MEMUSE