From a9accb6c39380c533d409d36d53fe309fd90d73b Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Thu, 30 Jan 2020 11:54:44 -0700 Subject: [PATCH] add more macro guards for builds --- src/ssl.c | 3 ++- tests/api.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 5bd76f09c..f6ce6773d 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -13455,6 +13455,7 @@ WOLFSSL_X509_CHAIN* wolfSSL_SESSION_get_peer_chain(WOLFSSL_SESSION* session) } +#ifdef OPENSSL_EXTRA /* gets the peer certificate associated with the session passed in * returns null on failure, the caller should not free the returned pointer */ WOLFSSL_X509* wolfSSL_SESSION_get0_peer(WOLFSSL_SESSION* session) @@ -13478,7 +13479,7 @@ WOLFSSL_X509* wolfSSL_SESSION_get0_peer(WOLFSSL_SESSION* session) return NULL; } - +#endif /* OPENSSL_EXTRA */ #endif /* SESSION_INDEX && SESSION_CERTS */ diff --git a/tests/api.c b/tests/api.c index 5974c90ef..1646b4684 100644 --- a/tests/api.c +++ b/tests/api.c @@ -23928,7 +23928,7 @@ static void test_wolfSSL_BIO_puts(void) #endif } -#if defined(OPENSSL_EXTRA) && !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && \ +#if defined(OPENSSL_ALL) && !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && \ !defined(NO_RSA) && defined(HAVE_EXT_CACHE) && \ defined(HAVE_IO_TESTS_DEPENDENCIES) static int forceWantRead(WOLFSSL *ssl, char *buf, int sz, void *ctx) @@ -23943,7 +23943,7 @@ static int forceWantRead(WOLFSSL *ssl, char *buf, int sz, void *ctx) static void test_wolfSSL_BIO_should_retry(void) { -#if defined(OPENSSL_EXTRA) && !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && \ +#if defined(OPENSSL_ALL) && !defined(NO_FILESYSTEM) && !defined(NO_CERTS) && \ !defined(NO_RSA) && defined(HAVE_EXT_CACHE) && \ defined(HAVE_IO_TESTS_DEPENDENCIES) tcp_ready ready;