feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #7971 from douzzer/20240912-gating-tweaks

Browse Source 
20240912-gating-tweaks
This commit is contained in:
David Garske
2024-09-12 15:30:11 -07:00
committed by GitHub
parent ad7c25b409 e3301b06f6
commit de3c45a02c
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bio.c
View File

@@ -24,10 +24,9 @@
#endif #endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#if defined(OPENSSL_EXTRA) && !defined(_WIN32) #if defined(OPENSSL_EXTRA) && !defined(_WIN32) && !defined(_GNU_SOURCE)
/* turn on GNU extensions for XVASPRINTF with wolfSSL_BIO_printf */ /* turn on GNU extensions for XVASPRINTF with wolfSSL_BIO_printf */
#undef _GNU_SOURCE #define _GNU_SOURCE 1
#define _GNU_SOURCE
#endif #endif
#if !defined(WOLFSSL_BIO_INCLUDED) #if !defined(WOLFSSL_BIO_INCLUDED)

5
src/ssl.c
View File

@@ -25,10 +25,9 @@
#endif #endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#if defined(OPENSSL_EXTRA) && !defined(_WIN32) #if defined(OPENSSL_EXTRA) && !defined(_WIN32) && !defined(_GNU_SOURCE)
/* turn on GNU extensions for XISASCII */ /* turn on GNU extensions for XISASCII */
#undef _GNU_SOURCE #define _GNU_SOURCE 1
#define _GNU_SOURCE
#endif #endif
#if !defined(WOLFCRYPT_ONLY) || defined(OPENSSL_EXTRA) || \ #if !defined(WOLFCRYPT_ONLY) || defined(OPENSSL_EXTRA) || \

15
wolfssl/openssl/opensslv.h
View File

@@ -34,7 +34,10 @@
defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER == 0x0090810fL) ||\ defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER == 0x0090810fL) ||\
defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER == 0x10100000L) ||\ defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER == 0x10100000L) ||\
defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER == 0x10001040L) defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER == 0x10001040L)
/* valid version */ /* valid version */
#elif defined(OPENSSL_VERSION_NUMBER)
/* unrecognized version, but continue. */
#define WOLFSSL_OPENSSL_VERSION_NUMBER_UNRECOGNIZED
#elif defined(HAVE_MOSQUITTO) #elif defined(HAVE_MOSQUITTO)
#define OPENSSL_VERSION_NUMBER 0x10100000L #define OPENSSL_VERSION_NUMBER 0x10100000L
#elif defined(WOLFSSL_APACHE_HTTPD) || defined(HAVE_LIBEST) || \ #elif defined(WOLFSSL_APACHE_HTTPD) || defined(HAVE_LIBEST) || \
@@ -57,11 +60,15 @@
#define OPENSSL_VERSION_NUMBER 0x0090810fL #define OPENSSL_VERSION_NUMBER 0x0090810fL
#endif #endif
#define OPENSSL_VERSION_TEXT "wolfSSL " LIBWOLFSSL_VERSION_STRING #ifndef OPENSSL_VERSION_TEXT
#define OPENSSL_VERSION 0 #define OPENSSL_VERSION_TEXT "wolfSSL " LIBWOLFSSL_VERSION_STRING
#endif
#ifndef OPENSSL_VERSION
#define OPENSSL_VERSION 0
#endif
#ifndef OPENSSL_IS_WOLFSSL #ifndef OPENSSL_IS_WOLFSSL
#define OPENSSL_IS_WOLFSSL #define OPENSSL_IS_WOLFSSL
#endif #endif
#endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */ #endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */