* Thu Jan 14 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.6.0-0.13.beta - Drop nss321 backport (and the related nss-headers patch), it did not help - Do an NSS/BoringSSL "chimera build" as will be the default in Chromium 47 - Update License accordingly (add "OpenSSL") - Fix the "chimera build" to call EnsureNSSHttpIOInit (backport from Chromium)epel9
Kevin Kofler
9 years ago
parent
12c45adaf5
commit
9a15e3c582
@ -0,0 +1,29 @@
|
||||
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);
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
diff -Nur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h qtwebengine-opensource-src-5.6.0-beta-nss-headers/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h
|
||||
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ qtwebengine-opensource-src-5.6.0-beta-nss-headers/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/nssoptions.h 2016-01-13 23:34:30.880040223 +0100
|
||||
@@ -0,0 +1,21 @@
|
||||
+/*
|
||||
+ * NSS utility functions
|
||||
+ *
|
||||
+ * This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
+/*
|
||||
+ * Include the default limits here
|
||||
+ */
|
||||
+/* SSL default limits are here so we don't have to import a private SSL header
|
||||
+ * file into NSS proper */
|
||||
+
|
||||
+/* The minimum server key sizes accepted by the clients.
|
||||
+ * Not 1024 to be conservative. */
|
||||
+#define SSL_RSA_MIN_MODULUS_BITS 1023
|
||||
+/* 1023 to avoid cases where p = 2q+1 for a 512-bit q turns out to be
|
||||
+ * only 1023 bits and similar. We don't have good data on whether this
|
||||
+ * happens because NSS used to count bit lengths incorrectly. */
|
||||
+#define SSL_DH_MIN_P_BITS 1023
|
||||
+#define SSL_DSA_MIN_P_BITS 1023
|
||||
+
|
||||
diff -Nur qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/verref.h qtwebengine-opensource-src-5.6.0-beta-nss-headers/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/verref.h
|
||||
--- qtwebengine-opensource-src-5.6.0-beta/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/verref.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ qtwebengine-opensource-src-5.6.0-beta-nss-headers/src/3rdparty/chromium/net/third_party/nss/ssl/bodge/verref.h 2016-01-13 23:59:22.996128771 +0100
|
||||
@@ -0,0 +1,40 @@
|
||||
+/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
+
|
||||
+/* This header is used inline in a function to ensure that a version string
|
||||
+ * symbol is linked in and not optimized out. A volatile reference is added to
|
||||
+ * the variable identified by NSS_VERSION_VARIABLE.
|
||||
+ *
|
||||
+ * Use this as follows:
|
||||
+ *
|
||||
+ * #define NSS_VERSION_VARIABLE __nss_ssl_version
|
||||
+ * #include "verref.h"
|
||||
+ */
|
||||
+
|
||||
+/* Suppress unused variable warnings. */
|
||||
+#ifdef _MSC_VER
|
||||
+#pragma warning(push)
|
||||
+#pragma warning(disable: 4101)
|
||||
+#endif
|
||||
+/* This works for both gcc and clang */
|
||||
+#if defined(__GNUC__) && !defined(NSS_NO_GCC48)
|
||||
+#pragma GCC diagnostic push
|
||||
+#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||
+#endif
|
||||
+
|
||||
+#ifndef NSS_VERSION_VARIABLE
|
||||
+#error NSS_VERSION_VARIABLE must be set before including "verref.h"
|
||||
+#endif
|
||||
+{
|
||||
+ extern const char NSS_VERSION_VARIABLE[];
|
||||
+ volatile const char _nss_version_c = NSS_VERSION_VARIABLE[0];
|
||||
+}
|
||||
+#undef NSS_VERSION_VARIABLE
|
||||
+
|
||||
+#ifdef _MSC_VER
|
||||
+#pragma warning(pop)
|
||||
+#endif
|
||||
+#if defined(__GNUC__) && !defined(NSS_NO_GCC48)
|
||||
+#pragma GCC diagnostic pop
|
||||
+#endif
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue