Skip to content

Commit

Permalink
Merge pull request wolfSSL#7553 from JacobBarthelmeh/coexist
Browse files Browse the repository at this point in the history
error out if conflicting OPENSSL compat macros are defined
  • Loading branch information
dgarske authored May 17, 2024
2 parents 15af87a + 568ec43 commit 2d5e840
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions wolfssl/wolfcrypt/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -3586,6 +3586,11 @@ extern void uITRON4_free(void *p) ;
#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,
* also define HAVE_WOLFENTROPY */
#ifdef HAVE_ENTROPY_MEMUSE
Expand Down

0 comments on commit 2d5e840

Please sign in to comment.