From ca9d012a2434a36c4d4567377ffb489eec9d6e27 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Wed, 30 Oct 2024 20:19:04 -0500 Subject: [PATCH] wolfssl/ssl.h: remove OPENSSL_EXTRA gate on definitions for WOLFSSL_ASN1_TYPE_* -- some are used in non-OPENSSL_EXTRA builds, e.g. when -DWOLFSSL_X509_NAME_AVAILABLE. --- wolfssl/ssl.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index d8ace94a3..bfd9c5a7e 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -251,8 +251,6 @@ typedef int (*WOLFSSL_X509_STORE_CTX_get_crl_cb)(WOLFSSL_X509_STORE_CTX *, typedef int (*WOLFSSL_X509_STORE_CTX_check_crl_cb)(WOLFSSL_X509_STORE_CTX *, WOLFSSL_X509_CRL *); -#ifdef OPENSSL_EXTRA - #define WOLFSSL_ASN1_TYPE_INTEGER 0x02 #define WOLFSSL_ASN1_TYPE_NEG 0x100 #define WOLFSSL_ASN1_TYPE_NEG_INTEGER (2 | WOLFSSL_ASN1_TYPE_NEG) @@ -317,8 +315,6 @@ typedef int (*WOLFSSL_X509_STORE_CTX_check_crl_cb)(WOLFSSL_X509_STORE_CTX *, #define WOLFSSL_ub_title CTC_NAME_SIZE /* 64 */ #define WOLFSSL_ub_email_address CTC_NAME_SIZE /* 128 */ -#endif /* OPENSSL_EXTRA */ - #if defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL) || defined(HAVE_CURL) struct WOLFSSL_OBJ_NAME {