From 2129e03f6f23a5c886da877117525469bf650b26 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 22 Nov 2019 17:35:59 -0800 Subject: Remove certs fix --- ...-ensure-that-loadable-certs-are-loaded-wh.patch | 33 ---------------------- 1 file changed, 33 deletions(-) delete mode 100644 0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch (limited to '0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch') diff --git a/0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch b/0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch deleted file mode 100644 index 92207ec..0000000 --- a/0001-Bug-1593167-ensure-that-loadable-certs-are-loaded-wh.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9e8f88c9ae80a2fc984f86f322cd6f2548722789 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Thu, 21 Nov 2019 21:32:55 +0100 -Subject: [PATCH] Bug 1593167, ensure that loadable certs are loaded when - TransportSecurityInfo::Read is called - -Backported to Firefox 70. - -https://phabricator.services.mozilla.com/D54135 ---- - security/manager/ssl/TransportSecurityInfo.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/security/manager/ssl/TransportSecurityInfo.cpp b/security/manager/ssl/TransportSecurityInfo.cpp -index dd3e12a19d41..224ac86ecf1c 100644 ---- a/security/manager/ssl/TransportSecurityInfo.cpp -+++ b/security/manager/ssl/TransportSecurityInfo.cpp -@@ -444,6 +444,12 @@ TransportSecurityInfo::Read(nsIObjectInputStream* aStream) { - return rv; - } - -+ // The logic below needs access to loadable certs. -+ rv = BlockUntilLoadableRootsLoaded(); -+ if (NS_FAILED(rv)) { -+ return rv; -+ } -+ - // moved from nsISSLStatus - if (!serVersion.EqualsASCII("1")) { - // nsISSLStatus may be present --- -2.24.0 - -- cgit v1.2.1