1234567891011121314151617181920212223242526 |
- $OpenBSD: patch-src_core_network-openssl_c,v 1.6 2018/02/23 14:39:51 sthen Exp $
- Index: src/core/network-openssl.c
- --- src/core/network-openssl.c.orig
- +++ src/core/network-openssl.c
- @@ -35,7 +35,8 @@
- #include <openssl/err.h>
-
- /* OpenSSL 1.1.0 introduced some backward-incompatible changes to the api */
- -#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
- +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
- + (!defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- /* The two functions below could be already defined if OPENSSL_API_COMPAT is
- * below the 1.1.0 version so let's do a clean start */
- #undef X509_get_notBefore
- @@ -47,7 +48,8 @@
-
- /* OpenSSL 1.1.0 also introduced some useful additions to the api */
- #if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
- -#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER)
- +#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
- + (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- static int X509_STORE_up_ref(X509_STORE *vfy)
- {
- int n;
|