diff options
-rw-r--r-- | dist/changes-5.0.0 | 3 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols_p.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index b16eb666ae..84add0dfcc 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -193,6 +193,9 @@ QtNetwork * QSslCertificate::serialNumber() now always returns the serial number in hexadecimal format. +* The openssl network backend now reads the ssl configuration file allowing + the use of openssl engines. + QtOpenGL -------- diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h index ecade35793..cc3da512dc 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols_p.h +++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -427,11 +427,7 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length); (char *)(rsa)) #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\ (char *)(dsa)) -#ifdef OPENSSL_LOAD_CONF #define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_conf() -#else -#define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_noconf() -#endif void q_OPENSSL_add_all_algorithms_noconf(); void q_OPENSSL_add_all_algorithms_conf(); int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath); |