summaryrefslogtreecommitdiff
path: root/libre-testing/qt5-webengine/qt5-webengine-nss.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre-testing/qt5-webengine/qt5-webengine-nss.patch')
-rw-r--r--libre-testing/qt5-webengine/qt5-webengine-nss.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/libre-testing/qt5-webengine/qt5-webengine-nss.patch b/libre-testing/qt5-webengine/qt5-webengine-nss.patch
deleted file mode 100644
index 6c0cdf1c7..000000000
--- a/libre-testing/qt5-webengine/qt5-webengine-nss.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc
-qtwebengine-opensource-src-5.6.0-beta-chimera-nss-init/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc
---- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc 2015-12-10 18:17:21.000000000 +0100
-+++ qtwebengine-opensource-src-5.6.0-beta-chimera-nss-init/src/3rdparty/chromium/net/socket/ssl_client_socket_openssl.cc 2016-01-14
-17:11:38.432633534 +0100
-@@ -57,6 +57,10 @@
- #include "net/ssl/ssl_platform_key.h"
- #endif
-
-+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
-+#include "net/cert_net/nss_ocsp.h"
-+#endif
-+
- namespace net {
-
- namespace {
-@@ -795,6 +799,14 @@
- DCHECK(!ssl_);
- DCHECK(!transport_bio_);
-
-+#if defined(USE_NSS_CERTS) || defined(OS_IOS)
-+ if (ssl_config_.cert_io_enabled) {
-+ // TODO(davidben): Move this out of SSLClientSocket. See
-+ // https://crbug.com/539520.
-+ EnsureNSSHttpIOInit();
-+ }
-+#endif
-+
- SSLContext* context = SSLContext::GetInstance();
- crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
-