You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
70 lines
3.0 KiB
70 lines
3.0 KiB
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
|