Skip to content

Commit 2d5e840

Browse files
authored
Merge pull request #7553 from JacobBarthelmeh/coexist
error out if conflicting OPENSSL compat macros are defined
2 parents 15af87a + 568ec43 commit 2d5e840

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

wolfssl/wolfcrypt/settings.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3586,6 +3586,11 @@ extern void uITRON4_free(void *p) ;
35863586
#endif
35873587
#endif
35883588

3589+
#if (defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL)) && \
3590+
defined(OPENSSL_COEXIST)
3591+
#error "OPENSSL_EXTRA can not be defined with OPENSSL_COEXIST"
3592+
#endif
3593+
35893594
/* if configure.ac turned on this feature, HAVE_ENTROPY_MEMUSE will be set,
35903595
* also define HAVE_WOLFENTROPY */
35913596
#ifdef HAVE_ENTROPY_MEMUSE

0 commit comments

Comments
 (0)