Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2017-10-29 20:23:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Sun Oct 29 20:23:58 2017 rev:69 rq:537327 version:5.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2017-10-23 16:20:43.644142559 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2017-10-29 20:23:57.868223008 +0100 @@ -1,0 +2,5 @@ +Fri Oct 27 18:52:40 UTC 2017 - [email protected] + +- Update 0001-QSslSocket-OpenSSL-1.1-backend.patch from git + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 0001-QSslSocket-OpenSSL-1.1-backend.patch ++++++ --- /var/tmp/diff_new_pack.ZkewBR/_old 2017-10-29 20:23:59.944147357 +0100 +++ /var/tmp/diff_new_pack.ZkewBR/_new 2017-10-29 20:23:59.948147211 +0100 @@ -1,4 +1,4 @@ -From cfbe03a6e035ab3cce5f04962cddd06bd414dcea Mon Sep 17 00:00:00 2001 +From c181441ae0ab7ebc0bfa846eb46060ce12bd2112 Mon Sep 17 00:00:00 2001 From: "Richard J. Moore" <[email protected]> Date: Thu, 23 Mar 2017 12:43:22 +0100 Subject: [PATCH] QSslSocket: OpenSSL 1.1 backend @@ -43,27 +43,27 @@ Reviewed-by: André Klitzing <[email protected]> Reviewed-by: Allan Sandfeld Jensen <[email protected]> --- - config.tests/unix/openssl11/openssl.cpp | 48 ++ + config.tests/unix/openssl11/openssl.cpp | 48 +++ config.tests/unix/openssl11/openssl.pro | 2 + src/network/configure.json | 11 + src/network/ssl/qsslcertificate_openssl.cpp | 57 +-- - src/network/ssl/qsslcontext_openssl.cpp | 309 +------------ - src/network/ssl/qsslcontext_openssl11.cpp | 277 +++++++++++ - src/network/ssl/qsslcontext_opensslpre11.cpp | 354 ++++++++++++++ + src/network/ssl/qsslcontext_openssl.cpp | 309 +------------- + src/network/ssl/qsslcontext_openssl11.cpp | 277 ++++++++++++ + src/network/ssl/qsslcontext_opensslpre11.cpp | 354 ++++++++++++++++ .../ssl/qssldiffiehellmanparameters_openssl.cpp | 38 +- src/network/ssl/qsslellipticcurve.h | 1 + src/network/ssl/qsslellipticcurve_openssl.cpp | 8 +- src/network/ssl/qsslkey_openssl.cpp | 79 ++-- - src/network/ssl/qsslsocket_openssl.cpp | 412 ++--------------- - src/network/ssl/qsslsocket_openssl11.cpp | 285 ++++++++++++ + src/network/ssl/qsslsocket_openssl.cpp | 368 ++-------------- + src/network/ssl/qsslsocket_openssl11.cpp | 285 +++++++++++++ src/network/ssl/qsslsocket_openssl11_symbols_p.h | 132 ++++++ src/network/ssl/qsslsocket_openssl_p.h | 8 +- - src/network/ssl/qsslsocket_openssl_symbols.cpp | 509 +++++++++++++-------- - src/network/ssl/qsslsocket_openssl_symbols_p.h | 127 +---- - src/network/ssl/qsslsocket_opensslpre11.cpp | 424 +++++++++++++++++ + src/network/ssl/qsslsocket_openssl_symbols.cpp | 471 ++++++++++++++------- + src/network/ssl/qsslsocket_openssl_symbols_p.h | 117 +---- + src/network/ssl/qsslsocket_opensslpre11.cpp | 424 +++++++++++++++++++ .../ssl/qsslsocket_opensslpre11_symbols_p.h | 230 ++++++++++ src/network/ssl/ssl.pri | 18 +- - 20 files changed, 2282 insertions(+), 1047 deletions(-) + 20 files changed, 2280 insertions(+), 957 deletions(-) create mode 100644 config.tests/unix/openssl11/openssl.cpp create mode 100644 config.tests/unix/openssl11/openssl.pro create mode 100644 src/network/ssl/qsslcontext_openssl11.cpp @@ -1451,7 +1451,52 @@ ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtNetwork module of the Qt Toolkit. -@@ -181,8 +182,8 @@ int QSslKeyPrivate::length() const +@@ -87,33 +88,30 @@ bool QSslKeyPrivate::fromEVP_PKEY(EVP_PK + if (pkey == nullptr) + return false; + +- if (pkey->type == EVP_PKEY_RSA) { ++#if QT_CONFIG(opensslv11) ++ const int keyType = q_EVP_PKEY_type(q_EVP_PKEY_base_id(pkey)); ++#else ++ const int keyType = pkey->type; ++#endif ++ if (keyType == EVP_PKEY_RSA) { + isNull = false; + algorithm = QSsl::Rsa; + type = QSsl::PrivateKey; +- +- rsa = q_RSA_new(); +- memcpy(rsa, q_EVP_PKEY_get1_RSA(pkey), sizeof(RSA)); +- ++ rsa = q_EVP_PKEY_get1_RSA(pkey); + return true; +- } +- else if (pkey->type == EVP_PKEY_DSA) { ++ } else if (keyType == EVP_PKEY_DSA) { + isNull = false; + algorithm = QSsl::Dsa; + type = QSsl::PrivateKey; +- +- dsa = q_DSA_new(); +- memcpy(dsa, q_EVP_PKEY_get1_DSA(pkey), sizeof(DSA)); +- ++ dsa = q_EVP_PKEY_get1_DSA(pkey); + return true; + } + #ifndef OPENSSL_NO_EC +- else if (pkey->type == EVP_PKEY_EC) { ++ else if (keyType == EVP_PKEY_EC) { + isNull = false; + algorithm = QSsl::Ec; + type = QSsl::PrivateKey; +- ec = q_EC_KEY_dup(q_EVP_PKEY_get1_EC_KEY(pkey)); +- ++ ec = q_EVP_PKEY_get1_EC_KEY(pkey); + return true; + } + #endif +@@ -181,8 +179,8 @@ int QSslKeyPrivate::length() const return -1; switch (algorithm) { @@ -1462,7 +1507,7 @@ #ifndef OPENSSL_NO_EC case QSsl::Ec: return q_EC_GROUP_get_degree(q_EC_KEY_get0_group(ec)); #endif -@@ -276,7 +277,13 @@ Qt::HANDLE QSslKeyPrivate::handle() cons +@@ -276,7 +274,13 @@ Qt::HANDLE QSslKeyPrivate::handle() cons static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, const QByteArray &key, const QByteArray &iv, int enc) { @@ -1477,7 +1522,7 @@ const EVP_CIPHER* type = 0; int i = 0, len = 0; -@@ -294,21 +301,44 @@ static QByteArray doCrypt(QSslKeyPrivate +@@ -294,21 +298,44 @@ static QByteArray doCrypt(QSslKeyPrivate QByteArray output; output.resize(data.size() + EVP_MAX_BLOCK_LENGTH); @@ -1643,17 +1688,7 @@ { QSslCipher ciph; -@@ -268,7 +190,8 @@ QSslCipher QSslSocketBackendPrivate::QSs - } - - // static --inline QSslErrorEntry QSslErrorEntry::fromStoreContext(X509_STORE_CTX *ctx) { -+inline QSslErrorEntry QSslErrorEntry::fromStoreContext(X509_STORE_CTX *ctx) -+{ - QSslErrorEntry result = { - q_X509_STORE_CTX_get_error(ctx), - q_X509_STORE_CTX_get_error_depth(ctx) -@@ -283,6 +206,7 @@ struct QSslErrorList +@@ -283,6 +205,7 @@ struct QSslErrorList QMutex mutex; QVector<QSslErrorEntry> errors; }; @@ -1661,7 +1696,7 @@ Q_GLOBAL_STATIC(QSslErrorList, _q_sslErrorList) int q_X509Callback(int ok, X509_STORE_CTX *ctx) -@@ -312,7 +236,7 @@ int q_X509Callback(int ok, X509_STORE_CT +@@ -312,7 +235,7 @@ int q_X509Callback(int ok, X509_STORE_CT } #endif } @@ -1670,7 +1705,7 @@ // errors gracefully after collecting all errors, after verification has // completed. return 1; -@@ -397,7 +321,7 @@ bool QSslSocketBackendPrivate::initSslCo +@@ -397,7 +320,7 @@ bool QSslSocketBackendPrivate::initSslCo if (configuration.protocol != QSsl::SslV2 && configuration.protocol != QSsl::SslV3 && configuration.protocol != QSsl::UnknownProtocol && @@ -1679,7 +1714,7 @@ // Set server hostname on TLS extension. RFC4366 section 3.1 requires it in ACE format. QString tlsHostName = verificationPeerName.isEmpty() ? q->peerName() : verificationPeerName; if (tlsHostName.isEmpty()) -@@ -438,13 +362,13 @@ bool QSslSocketBackendPrivate::initSslCo +@@ -438,13 +361,13 @@ bool QSslSocketBackendPrivate::initSslCo #if OPENSSL_VERSION_NUMBER >= 0x10001000L // Save a pointer to this object into the SSL structure. @@ -1695,7 +1730,7 @@ if (mode == QSslSocket::SslClientMode) q_SSL_set_psk_client_callback(ssl, &q_ssl_psk_client_callback); else if (mode == QSslSocket::SslServerMode) -@@ -466,16 +390,6 @@ void QSslSocketBackendPrivate::destroySs +@@ -466,16 +389,6 @@ void QSslSocketBackendPrivate::destroySs /*! \internal @@ -1712,7 +1747,7 @@ Does the minimum amount of initialization to determine whether SSL is supported or not. -@@ -486,92 +400,6 @@ bool QSslSocketPrivate::supportsSsl() +@@ -486,92 +399,6 @@ bool QSslSocketPrivate::supportsSsl() return ensureLibraryLoaded(); } @@ -1805,7 +1840,7 @@ /*! \internal -@@ -587,26 +415,6 @@ void QSslSocketPrivate::ensureInitialize +@@ -587,26 +414,6 @@ void QSslSocketPrivate::ensureInitialize ensureCiphersAndCertsLoaded(); } @@ -1832,7 +1867,7 @@ long QSslSocketPrivate::sslLibraryBuildVersionNumber() { return OPENSSL_VERSION_NUMBER; -@@ -628,7 +436,11 @@ QString QSslSocketPrivate::sslLibraryBui +@@ -628,7 +435,11 @@ QString QSslSocketPrivate::sslLibraryBui */ void QSslSocketPrivate::resetDefaultCiphers() { @@ -1844,7 +1879,7 @@ SSL *mySsl = q_SSL_new(myCtx); QList<QSslCipher> ciphers; -@@ -665,7 +477,7 @@ void QSslSocketPrivate::resetDefaultElli +@@ -665,7 +476,7 @@ void QSslSocketPrivate::resetDefaultElli QVector<QSslEllipticCurve> curves; #ifndef OPENSSL_NO_EC @@ -1853,7 +1888,7 @@ QVarLengthArray<EC_builtin_curve> builtinCurves(static_cast<int>(curveCount)); -@@ -699,13 +511,14 @@ QList<QSslCertificate> QSslSocketPrivate +@@ -699,13 +510,14 @@ QList<QSslCertificate> QSslSocketPrivate if (ptrCertOpenSystemStoreW && ptrCertFindCertificateInStore && ptrCertCloseStore) { HCERTSTORE hSystemStore; hSystemStore = ptrCertOpenSystemStoreW(0, L"ROOT"); @@ -1874,7 +1909,7 @@ QSslCertificate cert(der, QSsl::Der); systemCerts.append(cert); } -@@ -1503,14 +1316,8 @@ QSslCipher QSslSocketBackendPrivate::ses +@@ -1503,14 +1315,8 @@ QSslCipher QSslSocketBackendPrivate::ses { if (!ssl) return QSslCipher(); @@ -1891,7 +1926,7 @@ return sessionCipher ? QSslCipher_from_SSL_CIPHER(sessionCipher) : QSslCipher(); } -@@ -1536,112 +1343,6 @@ QSsl::SslProtocol QSslSocketBackendPriva +@@ -1536,112 +1342,6 @@ QSsl::SslProtocol QSslSocketBackendPriva return QSsl::UnknownProtocol; } @@ -2004,7 +2039,7 @@ QList<QSslCertificate> QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509) { ensureInitialized(); -@@ -1695,12 +1396,12 @@ QList<QSslError> QSslSocketBackendPrivat +@@ -1695,12 +1395,12 @@ QList<QSslError> QSslSocketBackendPrivat QMutexLocker sslErrorListMutexLocker(&_q_sslErrorList()->mutex); // Register a custom callback to get all verification errors. @@ -2019,7 +2054,7 @@ if (!intermediates) { q_X509_STORE_free(certStore); -@@ -1714,11 +1415,8 @@ QList<QSslError> QSslSocketBackendPrivat +@@ -1714,11 +1414,8 @@ QList<QSslError> QSslSocketBackendPrivat first = false; continue; } @@ -2033,7 +2068,7 @@ } } -@@ -1742,11 +1440,7 @@ QList<QSslError> QSslSocketBackendPrivat +@@ -1742,11 +1439,7 @@ QList<QSslError> QSslSocketBackendPrivat (void) q_X509_verify_cert(storeContext); q_X509_STORE_CTX_free(storeContext); @@ -2046,7 +2081,7 @@ // Now process the errors const auto errorList = std::move(_q_sslErrorList()->errors); -@@ -1820,7 +1514,8 @@ bool QSslSocketBackendPrivate::importPkc +@@ -1820,7 +1513,8 @@ bool QSslSocketBackendPrivate::importPkc // Convert to Qt types if (!key->d->fromEVP_PKEY(pkey)) { qCWarning(lcSsl, "Unable to convert private key"); @@ -2056,7 +2091,7 @@ q_X509_free(x509); q_EVP_PKEY_free(pkey); q_PKCS12_free(p12); -@@ -1835,7 +1530,11 @@ bool QSslSocketBackendPrivate::importPkc +@@ -1835,7 +1529,11 @@ bool QSslSocketBackendPrivate::importPkc *caCertificates = QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(ca); // Clean up @@ -2882,24 +2917,18 @@ DEFINEFUNC(int, X509_verify_cert, X509_STORE_CTX *a, a, return -1, return) DEFINEFUNC(int, X509_NAME_entry_count, X509_NAME *a, a, return 0, return) DEFINEFUNC2(X509_NAME_ENTRY *, X509_NAME_get_entry, X509_NAME *a, a, int b, b, return 0, return) -@@ -393,25 +481,8 @@ DEFINEFUNC2(int, X509_STORE_CTX_set_purp +@@ -393,7 +481,6 @@ DEFINEFUNC2(int, X509_STORE_CTX_set_purp DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return) DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return) DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return) -DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return) DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return) --#ifdef SSLEAY_MACROS --DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) --DEFINEFUNC2(int, i2d_RSAPrivateKey, const RSA *a, a, unsigned char **b, b, return -1, return) --#ifndef OPENSSL_NO_EC --DEFINEFUNC2(int, i2d_ECPrivateKey, const EC_KEY *a, a, unsigned char **b, b, return -1, return) --#endif --DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return) --DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return) --#ifndef OPENSSL_NO_EC --DEFINEFUNC3(EC_KEY *, d2i_ECPrivateKey, EC_KEY **a, a, unsigned char **b, b, long c, c, return 0, return) --#endif --#endif + #ifdef SSLEAY_MACROS + DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return) +@@ -407,11 +494,7 @@ DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DS + DEFINEFUNC3(EC_KEY *, d2i_ECPrivateKey, EC_KEY **a, a, unsigned char **b, b, long c, c, return 0, return) + #endif + #endif -DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG) -DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return) @@ -2908,7 +2937,7 @@ DEFINEFUNC2(int, i2d_SSL_SESSION, SSL_SESSION *in, in, unsigned char **pp, pp, return 0, return) DEFINEFUNC3(SSL_SESSION *, d2i_SSL_SESSION, SSL_SESSION **a, a, const unsigned char **pp, pp, long length, length, return 0, return) #if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -@@ -694,8 +765,8 @@ static QPair<QLibrary*, QLibrary*> loadO +@@ -694,8 +777,8 @@ static QPair<QLibrary*, QLibrary*> loadO #ifndef Q_OS_DARWIN // second attempt: find the development files libssl.so and libcrypto.so // @@ -2919,7 +2948,7 @@ // attempt, _after_ <bundle>/Contents/Frameworks has been searched. // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); -@@ -754,8 +825,12 @@ bool q_resolveOpenSslSymbols() +@@ -754,8 +837,12 @@ bool q_resolveOpenSslSymbols() static bool symbolsResolved = false; static bool triedToResolveSymbols = false; #ifndef QT_NO_THREAD @@ -2932,7 +2961,7 @@ if (symbolsResolved) return true; if (triedToResolveSymbols) -@@ -771,11 +846,145 @@ bool q_resolveOpenSslSymbols() +@@ -771,11 +858,145 @@ bool q_resolveOpenSslSymbols() // failed to load them return false; @@ -3014,7 +3043,7 @@ + RESOLVEFUNC(SSL_load_error_strings) +#if OPENSSL_VERSION_NUMBER >= 0x10001000L + RESOLVEFUNC(SSL_get_ex_new_index) - #endif ++#endif +#ifndef OPENSSL_NO_SSL2 + RESOLVEFUNC(SSLv2_client_method) +#endif @@ -3026,7 +3055,7 @@ +#if OPENSSL_VERSION_NUMBER >= 0x10001000L + RESOLVEFUNC(TLSv1_1_client_method) + RESOLVEFUNC(TLSv1_2_client_method) -+#endif + #endif +#ifndef OPENSSL_NO_SSL2 + RESOLVEFUNC(SSLv2_server_method) +#endif @@ -3079,7 +3108,7 @@ RESOLVEFUNC(ASN1_STRING_length) RESOLVEFUNC(ASN1_STRING_to_UTF8) RESOLVEFUNC(BIO_ctrl) -@@ -794,25 +1003,22 @@ bool q_resolveOpenSslSymbols() +@@ -794,25 +1015,22 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(BN_is_word) #endif RESOLVEFUNC(BN_mod_word) @@ -3109,7 +3138,7 @@ RESOLVEFUNC(EVP_PKEY_assign) RESOLVEFUNC(EVP_PKEY_set1_RSA) RESOLVEFUNC(EVP_PKEY_set1_DSA) -@@ -834,9 +1040,8 @@ bool q_resolveOpenSslSymbols() +@@ -834,9 +1052,8 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(i2t_ASN1_OBJECT) RESOLVEFUNC(OBJ_obj2txt) RESOLVEFUNC(OBJ_obj2nid) @@ -3121,7 +3150,7 @@ RESOLVEFUNC(PEM_read_bio_PrivateKey) RESOLVEFUNC(PEM_read_bio_DSAPrivateKey) RESOLVEFUNC(PEM_read_bio_RSAPrivateKey) -@@ -849,7 +1054,8 @@ bool q_resolveOpenSslSymbols() +@@ -849,7 +1066,8 @@ bool q_resolveOpenSslSymbols() #ifndef OPENSSL_NO_EC RESOLVEFUNC(PEM_write_bio_ECPrivateKey) #endif @@ -3131,7 +3160,7 @@ RESOLVEFUNC(PEM_read_bio_PUBKEY) RESOLVEFUNC(PEM_read_bio_DSA_PUBKEY) RESOLVEFUNC(PEM_read_bio_RSA_PUBKEY) -@@ -865,12 +1071,6 @@ bool q_resolveOpenSslSymbols() +@@ -865,12 +1083,6 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(RAND_status) RESOLVEFUNC(RSA_new) RESOLVEFUNC(RSA_free) @@ -3144,7 +3173,7 @@ RESOLVEFUNC(SSL_CIPHER_description) RESOLVEFUNC(SSL_CIPHER_get_bits) RESOLVEFUNC(SSL_CTX_check_private_key) -@@ -898,8 +1098,6 @@ bool q_resolveOpenSslSymbols() +@@ -898,8 +1110,6 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_get_peer_cert_chain) RESOLVEFUNC(SSL_get_peer_certificate) RESOLVEFUNC(SSL_get_verify_result) @@ -3153,7 +3182,7 @@ RESOLVEFUNC(SSL_new) RESOLVEFUNC(SSL_ctrl) RESOLVEFUNC(SSL_read) -@@ -912,7 +1110,6 @@ bool q_resolveOpenSslSymbols() +@@ -912,7 +1122,6 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_get1_session) RESOLVEFUNC(SSL_get_session) #if OPENSSL_VERSION_NUMBER >= 0x10001000L @@ -3161,7 +3190,7 @@ RESOLVEFUNC(SSL_set_ex_data) RESOLVEFUNC(SSL_get_ex_data) #endif -@@ -922,30 +1119,6 @@ bool q_resolveOpenSslSymbols() +@@ -922,30 +1131,6 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(SSL_CTX_use_psk_identity_hint) #endif RESOLVEFUNC(SSL_write) @@ -3192,7 +3221,7 @@ RESOLVEFUNC(X509_NAME_entry_count) RESOLVEFUNC(X509_NAME_get_entry) RESOLVEFUNC(X509_NAME_ENTRY_get_data) -@@ -961,12 +1134,12 @@ bool q_resolveOpenSslSymbols() +@@ -961,12 +1146,12 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(X509_STORE_CTX_get_error) RESOLVEFUNC(X509_STORE_CTX_get_error_depth) RESOLVEFUNC(X509_STORE_CTX_get_current_cert) @@ -3206,7 +3235,7 @@ RESOLVEFUNC(X509_EXTENSION_get_object) RESOLVEFUNC(X509_free) RESOLVEFUNC(X509_get_ext) -@@ -982,20 +1155,11 @@ bool q_resolveOpenSslSymbols() +@@ -982,6 +1167,7 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(X509_check_issued) RESOLVEFUNC(X509_get_issuer_name) RESOLVEFUNC(X509_get_subject_name) @@ -3214,12 +3243,10 @@ RESOLVEFUNC(X509_verify_cert) RESOLVEFUNC(d2i_X509) RESOLVEFUNC(i2d_X509) --#ifdef SSLEAY_MACROS -- RESOLVEFUNC(i2d_DSAPrivateKey) -- RESOLVEFUNC(i2d_RSAPrivateKey) -- RESOLVEFUNC(d2i_DSAPrivateKey) -- RESOLVEFUNC(d2i_RSAPrivateKey) --#endif +@@ -991,11 +1177,7 @@ bool q_resolveOpenSslSymbols() + RESOLVEFUNC(d2i_DSAPrivateKey) + RESOLVEFUNC(d2i_RSAPrivateKey) + #endif - RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf) - RESOLVEFUNC(OPENSSL_add_all_algorithms_conf) RESOLVEFUNC(SSL_CTX_load_verify_locations) @@ -3228,7 +3255,7 @@ RESOLVEFUNC(i2d_SSL_SESSION) RESOLVEFUNC(d2i_SSL_SESSION) #if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(OPENSSL_NO_NEXTPROTONEG) -@@ -1019,27 +1183,14 @@ bool q_resolveOpenSslSymbols() +@@ -1019,27 +1201,14 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EC_KEY_new_by_curve_name) RESOLVEFUNC(EC_KEY_free) RESOLVEFUNC(EC_get_builtin_curves)
