ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

nss: try to remove nss.windowbuild.patch.0

Browse Source 
It's not obvious to me what problem this solves.  Maybe the problem no
longer exsists in the new upstream release?

Change-Id: I16762e0024536afb821eac70c6ba3929d5b8927a
Reviewed-on: https://gerrit.libreoffice.org/36798
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Michael Stahl
2017-04-21 17:52:56 +02:00
parent 5751291e8c
commit 489414f239
2 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/nss/UnpackedTarball_nss.mk
Vendored
-1
View File
@@ -22,7 +22,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.vs2015.patch) \
external/nss/ubsan.patch.0 \
external/nss/clang-cl.patch.0 \
external/nss/nss.windowbuild.patch.0 \
$(if $(filter IOS,$(OS)), \
external/nss/nss-chromium-nss-static.patch \
external/nss/nss-more-static.patch \
external/nss/nss.windowbuild.patch.0
Vendored
-55
View File
@@ -1,55 +0,0 @@
--- ./nss/gtests/ssl_gtest/tls_connect.cc
+++ ./nss/gtests/ssl_gtest/tls_connect.cc
@@ -375,6 +375,12 @@
}
}
+// A simple value of "a", "b". Note that the preferred value of "a" is placed
+// at the end, because the NSS API follows the now defunct NPN specification,
+// which places the preferred (and default) entry at the end of the list.
+// NSS will move this final entry to the front when used with ALPN.
+const uint8_t alpn_dummy_val_[4] = { 0x01, 0x62, 0x01, 0x61 };
+
void TlsConnectTestBase::EnableAlpn() {
client_->EnableAlpn(alpn_dummy_val_, sizeof(alpn_dummy_val_));
server_->EnableAlpn(alpn_dummy_val_, sizeof(alpn_dummy_val_));
--- ./nss/gtests/ssl_gtest/tls_connect.h
+++ ./nss/gtests/ssl_gtest/tls_connect.h
@@ -113,12 +113,6 @@
SessionResumptionMode expected_resumption_mode_;
std::vector<std::vector<uint8_t>> session_ids_;
- // A simple value of "a", "b". Note that the preferred value of "a" is placed
- // at the end, because the NSS API follows the now defunct NPN specification,
- // which places the preferred (and default) entry at the end of the list.
- // NSS will move this final entry to the front when used with ALPN.
- const uint8_t alpn_dummy_val_[4] = {0x01, 0x62, 0x01, 0x61};
-
private:
static inline Mode ToMode(const std::string& str) {
return str == "TLS" ? STREAM : DGRAM;
--- ./nss/gtests/ssl_gtest/ssl_loopback_unittest.cc
+++ ./nss/gtests/ssl_gtest/ssl_loopback_unittest.cc
@@ -51,6 +51,12 @@
CheckAlpn("a");
}
+// A simple value of "a", "b". Note that the preferred value of "a" is placed
+// at the end, because the NSS API follows the now defunct NPN specification,
+// which places the preferred (and default) entry at the end of the list.
+// NSS will move this final entry to the front when used with ALPN.
+const uint8_t alpn_dummy_val_[4] = { 0x01, 0x62, 0x01, 0x61 };
+
TEST_P(TlsConnectGeneric, ConnectAlpnClone) {
EnsureModelSockets();
client_model_->EnableAlpn(alpn_dummy_val_, sizeof(alpn_dummy_val_));
--- ./nss/gtests/ssl_gtest/databuffer.h
+++ ./nss/gtests/ssl_gtest/databuffer.h
@@ -10,6 +10,7 @@
#include <algorithm>
#include <cassert>
#include <cstring>
+#include <cstdint>
#include <iomanip>
#include <iostream>
#if defined(WIN32) || defined(WIN64)