cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-07 19:31:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation without OPENSSL_API_COMPAT

Browse Source 
Use the following for openssl 1.1+:
- X509_getm_notBefore over X509_get_notBefore
- X509_getm_notAfter  over X509_get_notAfter
- use OPENSSL_VERSION_NUMBER over SSLeay()
- add missing headers

Refs: openssl/openssl@0b7347effe
(cherry picked from commit 08981f8d752ad23e21887b42944783e843b2e281)
This commit is contained in:
Azat Khuzhin 2020-01-05 19:02:22 +03:00
parent d42240d1c6
commit 921bdcdd81
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openssl-compat.h
View File

@ -34,6 +34,9 @@ static inline BIO_METHOD *BIO_meth_new(int type, const char *name)
#define TLS_method SSLv23_method #define TLS_method SSLv23_method
#define X509_getm_notBefore X509_get_notBefore
#define X509_getm_notAfter X509_get_notAfter
#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \ #endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) */

8
test/regress_ssl.c
View File

@ -148,9 +148,9 @@ ssl_getcert(EVP_PKEY *key)
X509_set_issuer_name(x509, name); X509_set_issuer_name(x509, name);
X509_NAME_free(name); X509_NAME_free(name);
X509_time_adj(X509_get_notBefore(x509), 0, &now); X509_time_adj(X509_getm_notBefore(x509), 0, &now);
now += 3600; now += 3600;
X509_time_adj(X509_get_notAfter(x509), 0, &now); X509_time_adj(X509_getm_notAfter(x509), 0, &now);
X509_set_pubkey(x509, key); X509_set_pubkey(x509, key);
tt_assert(0 != X509_sign(x509, key, EVP_sha1())); tt_assert(0 != X509_sign(x509, key, EVP_sha1()));
@ -469,8 +469,8 @@ regress_bufferevent_openssl(void *arg)
type = (enum regress_openssl_type)data->setup_data; type = (enum regress_openssl_type)data->setup_data;
if (type & REGRESS_OPENSSL_RENEGOTIATE) { if (type & REGRESS_OPENSSL_RENEGOTIATE) {
if (SSLeay() >= 0x10001000 && if (OPENSSL_VERSION_NUMBER >= 0x10001000 &&
SSLeay() < 0x1000104f) { OPENSSL_VERSION_NUMBER < 0x1000104f) {
/* 1.0.1 up to 1.0.1c has a bug where TLS1.1 and 1.2 /* 1.0.1 up to 1.0.1c has a bug where TLS1.1 and 1.2
* can't renegotiate with themselves. Disable. */ * can't renegotiate with themselves. Disable. */
disable_tls_11_and_12 = 1; disable_tls_11_and_12 = 1;