Line 0
Link Here
|
|
|
1 |
--- config.tests/unix/openssl11/openssl.cpp 2017-11-05 16:07:40.963385070 -0500 |
2 |
+++ config.tests/unix/openssl11/openssl.cpp 2017-11-05 16:07:51.755255545 -0500 |
3 |
@@ -39,7 +39,7 @@ |
4 |
|
5 |
#include <openssl/opensslv.h> |
6 |
|
7 |
-#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L |
8 |
+#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
9 |
# error "OpenSSL >= 1.1 is required" |
10 |
#endif |
11 |
|
12 |
|
13 |
--- src/network/ssl/qsslcontext_openssl.cpp |
14 |
+++ src/network/ssl/qsslcontext_openssl.cpp |
15 |
@@ -248,7 +248,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) |
16 |
if (sslContext->sslConfiguration.backendConfiguration().isEmpty()) |
17 |
return; |
18 |
|
19 |
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L |
20 |
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) |
21 |
if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) { |
22 |
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); |
23 |
if (cctx) { |
24 |
|
25 |
|
26 |
--- src/network/ssl/qsslsocket_openssl_symbols.cpp |
27 |
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp |
28 |
@@ -402,7 +402,7 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - |
29 |
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) |
30 |
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) |
31 |
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return 0, return) |
32 |
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L |
33 |
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) |
34 |
DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return 0, return); |
35 |
DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); |
36 |
DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); |
37 |
--- src/network/ssl/qsslsocket_openssl_symbols_p.h |
38 |
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h |
39 |
@@ -352,7 +352,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); |
40 |
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); |
41 |
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); |
42 |
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); |
43 |
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L |
44 |
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER) |
45 |
SSL_CONF_CTX *q_SSL_CONF_CTX_new(); |
46 |
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); |
47 |
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); |