head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.66 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.64 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.62 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.60 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.58 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.56 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.54 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.52 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.50 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.48 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.46 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.44 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.42 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.40 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.38 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.36 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.34 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.32 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.30 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.28 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.26 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.24 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.22 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.20 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.16 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.18 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.14 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.12 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.10 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.8 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.6 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.4 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.2 pkgsrc-2018Q1-base:1.3 pkgsrc-2013Q2:1.2.0.4 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q1:1.1.0.2 pkgsrc-2012Q1-base:1.1; locks; strict; comment @// @; 1.3 date 2018.01.17.18.37.34; author markd; state Exp; branches; next 1.2; commitid q0VUPpiP65EQ7gnA; 1.2 date 2012.04.09.09.12.49; author adam; state dead; branches; next 1.1; 1.1 date 2012.01.14.10.23.18; author obache; state Exp; branches; next ; desc @@ 1.3 log @qt4-libs: Compile with openssl-1.1.0 @ text @$NetBSD$ react to OPENSSL_NO_SSL3 Compile with openssl-1.1.0 http://bugs.debian.org/828522 via archlinux --- src/network/ssl/qsslsocket_openssl.cpp.orig 2015-05-07 14:14:44.000000000 +0000 +++ src/network/ssl/qsslsocket_openssl.cpp @@@@ -93,6 +93,7 @@@@ bool QSslSocketPrivate::s_libraryLoaded bool QSslSocketPrivate::s_loadedCiphersAndCerts = false; bool QSslSocketPrivate::s_loadRootCertsOnDemand = false; +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* \internal From OpenSSL's thread(3) manual page: @@@@ -174,6 +175,8 @@@@ static unsigned long id_function() } } // extern "C" +#endif //OPENSSL_VERSION_NUMBER >= 0x10100000L + QSslSocketBackendPrivate::QSslSocketBackendPrivate() : ssl(0), ctx(0), @@@@ -222,9 +225,12 @@@@ QSslCipher QSslSocketBackendPrivate::QSs ciph.d->encryptionMethod = descriptionList.at(4).mid(4); ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export")); +#if OPENSSL_VERSION_NUMBER < 0x10100000L ciph.d->bits = cipher->strength_bits; ciph.d->supportedBits = cipher->alg_bits; - +#else + ciph.d->bits = q_SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits); +#endif } return ciph; } @@@@ -267,7 +273,11 @@@@ init_context: #endif break; case QSsl::SslV3: +#ifndef OPENSSL_NO_SSL3 ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); +#else + ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error +#endif break; case QSsl::SecureProtocols: // SslV2 will be disabled below case QSsl::TlsV1SslV3: // SslV2 will be disabled below @@@@ -363,7 +373,7 @@@@ init_context: // // See also: QSslContext::fromConfiguration() if (caCertificate.expiryDate() >= QDateTime::currentDateTime()) { - q_X509_STORE_add_cert(ctx->cert_store, (X509 *)caCertificate.handle()); + q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle()); } } @@@@ -500,8 +510,10 @@@@ void QSslSocketBackendPrivate::destroySs */ void QSslSocketPrivate::deinitialize() { +#if OPENSSL_VERSION_NUMBER < 0x10100000L q_CRYPTO_set_id_callback(0); q_CRYPTO_set_locking_callback(0); +#endif } /*! @@@@ -522,13 +534,17 @@@@ bool QSslSocketPrivate::ensureLibraryLoa return false; // Check if the library itself needs to be initialized. +#if OPENSSL_VERSION_NUMBER < 0x10100000L QMutexLocker locker(openssl_locks()->initLock()); +#endif if (!s_libraryLoaded) { s_libraryLoaded = true; // Initialize OpenSSL. +#if OPENSSL_VERSION_NUMBER < 0x10100000L q_CRYPTO_set_id_callback(id_function); q_CRYPTO_set_locking_callback(locking_function); +#endif if (q_SSL_library_init() != 1) return false; q_SSL_load_error_strings(); @@@@ -567,7 +583,9 @@@@ bool QSslSocketPrivate::ensureLibraryLoa void QSslSocketPrivate::ensureCiphersAndCertsLoaded() { - QMutexLocker locker(openssl_locks()->initLock()); +#if OPENSSL_VERSION_NUMBER < 0x10100000L + QMutexLocker locker(openssl_locks()->initLock()); +#endif if (s_loadedCiphersAndCerts) return; s_loadedCiphersAndCerts = true; @@@@ -659,13 +677,18 @@@@ void QSslSocketPrivate::resetDefaultCiph STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl); for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) { if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) { - if (cipher->valid) { + +#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (cipher->valid) { +#endif QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher); if (!ciph.isNull()) { if (!ciph.name().toLower().startsWith(QLatin1String("adh"))) ciphers << ciph; } +#if OPENSSL_VERSION_NUMBER < 0x10100000L } +#endif } } @ 1.2 log @Changes 4.8.1: Qt 4.8.1 is the first patch release to the 4.8 series with over 200 functional improvements to the desktop and embedded platforms. The majority of the error corrections, made primarily by Digia, have been on desktop and embedded platforms with a large number of fixes with focus on QtCore, QtGUI and QtNetwork. These fixes benefit all desktop platforms. Qt 4.8.1 also includes Mac App Store support. @ text @d1 1 a1 1 $NetBSD: patch-src_network_ssl_qsslsocket__openssl.cpp,v 1.1 2012/01/14 10:23:18 obache Exp $ d3 2 a4 2 * fix build with -openssl-linked for OpenSSL 0.9.8* http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a d6 1 a6 1 --- src/network/ssl/qsslsocket_openssl.cpp.orig 2011-12-08 05:06:02.000000000 +0000 d8 109 a116 10 @@@@ -451,11 +451,7 @@@@ init_context: if (!ace.isEmpty() && !QHostAddress().setAddress(tlsHostName) && !(configuration.sslOptions & QSsl::SslOptionDisableServerNameIndication)) { -#if OPENSSL_VERSION_NUMBER >= 0x10000000L if (!q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, ace.data())) -#else - if (!q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, ace.constData())) -#endif qWarning("could not set SSL_CTRL_SET_TLSEXT_HOSTNAME, Server Name Indication disabled"); d119 1 @ 1.1 log @Fixes build with openssl<1.0.0. taken from upstream: http://qt.gitorious.org/qt/qt/commit/4db91cbd6147e40f543342f22c05b7baddc52e5a resolve PR#45832. @ text @d1 1 a1 1 $NetBSD$ @