[tor-commits] [torbrowser/master] Fix the 3rd firefox patch.

[erinn at torproject.org]

commit f799f2a0b743a185b4aa6b1cb5b058c7a51f5670
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Sat Aug 20 10:23:09 2011 -0700

    Fix the 3rd firefox patch.
---
 ...-Make-Intermediate-Cert-Store-memory-only.patch |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch
index 9c568a0..68d426d 100644
--- a/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch
+++ b/src/current-patches/0003-Firefox6-Make-Intermediate-Cert-Store-memory-only.patch
@@ -1,4 +1,4 @@
-From 2bdee82990bbda960d23d6122bf89d422bb63211 Mon Sep 17 00:00:00 2001
+From c50f65a9f11e09332c2c97678b685d2bdcad7d62 Mon Sep 17 00:00:00 2001
 From: Mike Perry <mikeperry-git at fscked.org>
 Date: Fri, 19 Aug 2011 17:58:23 -0700
 Subject: [PATCH 3/3] Firefox6: Make Intermediate Cert Store memory-only.
@@ -8,17 +8,18 @@ This patch makes the intermediate SSL cert store exist in memory only.
 The pref must be set before startup in prefs.js.
 https://trac.torproject.org/projects/tor/ticket/2949
 ---
- security/manager/ssl/src/nsNSSComponent.cpp |   16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
+ security/manager/ssl/src/nsNSSComponent.cpp |   15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
 
 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
-index 7a8569b..5261c5e 100644
+index 7a8569b..828c3eb 100644
 --- a/security/manager/ssl/src/nsNSSComponent.cpp
 +++ b/security/manager/ssl/src/nsNSSComponent.cpp
-@@ -1729,6 +1729,22 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox)
+@@ -1729,8 +1729,21 @@ nsNSSComponent::InitializeNSS(PRBool showWarningBox)
      // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as
      // "/usr/lib/nss/libnssckbi.so".
      PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
+-    SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "",
 +    PRBool nocertdb = false;
 +    mPrefBranch->GetBoolPref("security.nocertdb", &nocertdb);
 +
@@ -32,12 +33,11 @@ index 7a8569b..5261c5e 100644
 +        init_rv = ::NSS_NoDB_Init(NULL);
 +    } else {
 +        init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-+                                         SECMOD_DB, init_flags);
-+    }
-+
-     SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "",
                                           SECMOD_DB, init_flags);
++    }
  
+     if (init_rv != SECSuccess) {
+       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get()));
 -- 
 1.7.3.4