summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorRichard Moore <rich@kde.org>2011-11-14 21:56:40 (GMT)
committerPeter Hartmann <peter.hartmann@nokia.com>2011-11-15 12:49:52 (GMT)
commited4d47fde11bf1bded55394358b19ceedb1d5768 (patch)
treeb1bdc3d18fd3a48a63a7d42d7fe8d047a4a323d3 /tests/manual
parent32e931b40edf4dc53424f3435d22f5c6419182f5 (diff)
downloadQt-ed4d47fde11bf1bded55394358b19ceedb1d5768.zip
Qt-ed4d47fde11bf1bded55394358b19ceedb1d5768.tar.gz
Qt-ed4d47fde11bf1bded55394358b19ceedb1d5768.tar.bz2
Add the ability to do unsafe SSL renegotiation as a fallback.
This commit adds the ability to perform legacy SSL renegotiation as a fallback via QSsl::SslOptions. This is something that used to work, but has been disabled by default in newer versions of openssl. The need for this has been reported by users (eg. in QTBUG-14983). Change-Id: I5b80f3ffd07e0c5faddc469f6a8f857bac5740f7 Reviewed-by: Corentin Chary <corentin.chary@gmail.com> Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> (cherry picked from commit 75b2a4960b753766ea2eec4dbd34c67733ca8089)
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/qssloptions/main.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/manual/qssloptions/main.cpp b/tests/manual/qssloptions/main.cpp
index 6f2f361..727ad23 100644
--- a/tests/manual/qssloptions/main.cpp
+++ b/tests/manual/qssloptions/main.cpp
@@ -56,6 +56,7 @@ int main(int argc, char **argv)
out << "disable_session_tickets" << endl;
out << "disable_compression" << endl;
out << "disable_sni" << endl;
+ out << "enable_unsafe_reneg" << endl;
return 1;
}
@@ -75,6 +76,8 @@ int main(int argc, char **argv)
config.setSslOption(QSsl::SslOptionDisableCompression, true);
else if (option == QLatin1String("disable_sni"))
config.setSslOption(QSsl::SslOptionDisableServerNameIndication, true);
+ else if (option == QStringLiteral("enable_unsafe_reneg"))
+ config.setSslOption(QSsl::SslOptionDisableLegacyRenegotiation, false);
}
QSslConfiguration::setDefaultConfiguration(config);