additional fixes and enhancements for -DOPENSSL_EXTRA -DOPENSSL_COEXIST:

configure.ac:
* add --enable-all-osp to separate OSP meta-feature sets from --enable-all, allowing --enable-all --disable-all-osp --disable-opensslall (e.g. for testing OPENSSL_COEXIST).
* fix enable_all_crypto=yes in enable-all to be conditional on "$enable_all_crypto" = "".
* move enable_rsapss=yes from enable-all to enable-all-crypto.

examples/ and testsuite/: #undef OPENSSL_COEXIST unconditionally rather than only if defined(OPENSSL_EXTRA), to capture -DOPENSSL_EXTRA_X509_SMALL or any other such variants.
This commit is contained in:
Daniel Pouzzner
2024-10-31 13:42:04 -05:00
parent 39e8cb55bb
commit 950ee40111
7 changed files with 68 additions and 50 deletions

View File

@@ -41,9 +41,7 @@ Or
#include <wolfssl/wolfcrypt/settings.h>
#undef TEST_OPENSSL_COEXIST /* can't use this option with this example */
#ifdef OPENSSL_EXTRA
#undef OPENSSL_COEXIST /* can't use this option with this example */
#endif
#undef OPENSSL_COEXIST /* can't use this option with this example */
#include <wolfssl/wolfcrypt/types.h>
#include <wolfssl/wolfcrypt/wc_port.h>

View File

@@ -33,9 +33,7 @@
#include <wolfssl/wolfcrypt/settings.h>
#undef TEST_OPENSSL_COEXIST /* can't use this option with this example */
#ifdef OPENSSL_EXTRA
#undef OPENSSL_COEXIST /* can't use this option with this example */
#endif
#undef OPENSSL_COEXIST /* can't use this option with this example */
#include <wolfssl/ssl.h>

View File

@@ -30,9 +30,7 @@
#include <wolfssl/wolfcrypt/settings.h>
#undef TEST_OPENSSL_COEXIST /* can't use this option with this example */
#ifdef OPENSSL_EXTRA
#undef OPENSSL_COEXIST /* can't use this option with this example */
#endif
#undef OPENSSL_COEXIST /* can't use this option with this example */
#include <wolfssl/ssl.h> /* name change portability layer */
#include <wolfssl/wolfcrypt/settings.h>

View File

@@ -33,9 +33,7 @@
#include <wolfssl/wolfcrypt/settings.h>
#undef TEST_OPENSSL_COEXIST /* can't use this option with this example */
#ifdef OPENSSL_EXTRA
#undef OPENSSL_COEXIST /* can't use this option with this example */
#endif
#undef OPENSSL_COEXIST /* can't use this option with this example */
#include <wolfssl/ssl.h> /* name change portability layer */