denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: Fix build with OpenSSL 1.1.1 without compatibility layer

Browse Source 
If OpenSSL is built with --api, defines for deprecated functions in
OpenSSL's header files are not visible anymore.

Fixes #3045.
This commit is contained in:
Tobias Brunner
2019-05-08 14:28:18 +02:00
parent 91dce6e876
commit a4abb263c9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_x509.c
+4 -2
View File
@@ -77,6 +77,8 @@ static inline void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg
#define X509v3_addr_get_afi v3_addr_get_afi #define X509v3_addr_get_afi v3_addr_get_afi
#define X509v3_addr_get_range v3_addr_get_range #define X509v3_addr_get_range v3_addr_get_range
#define X509v3_addr_is_canonical v3_addr_is_canonical #define X509v3_addr_is_canonical v3_addr_is_canonical
#define X509_get0_notBefore X509_get_notBefore
#define X509_get0_notAfter X509_get_notAfter
#endif #endif
typedef struct private_openssl_x509_t private_openssl_x509_t; typedef struct private_openssl_x509_t private_openssl_x509_t;
@@ -1137,8 +1139,8 @@ static bool parse_certificate(private_openssl_x509_t *this)
return FALSE; return FALSE;
} }
this->notBefore = openssl_asn1_to_time(X509_get_notBefore(this->x509)); this->notBefore = openssl_asn1_to_time(X509_get0_notBefore(this->x509));
this->notAfter = openssl_asn1_to_time(X509_get_notAfter(this->x509)); this->notAfter = openssl_asn1_to_time(X509_get0_notAfter(this->x509));
/* while X509_ALGOR_cmp() is declared in the headers of older OpenSSL /* while X509_ALGOR_cmp() is declared in the headers of older OpenSSL
* versions, at least on Ubuntu 14.04 it is not actually defined */ * versions, at least on Ubuntu 14.04 it is not actually defined */