Bug 662557, OCSP validation errors are wrongly reported as SEC_ERROR_NO_MEMORY errors from CERT_PKIXVerifyCert, backout debug patch, r=bsmith

security/coreconf/coreconf.dep

@@ -42,3 +42,4 @@
  */
 
 #error "Do not include this header file."
+

security/nss/lib/util/secport.c

@@ -180,10 +180,6 @@ PORT_SetError(int value)
 #ifdef DEBUG_jp96085
     PORT_Assert(value != SEC_ERROR_REUSED_ISSUER_AND_SERIAL);
 #endif
-    if (value == SEC_ERROR_NO_MEMORY &&
-        PR_GetEnv("NSS_DEBUG_SEC_ERROR_NO_MEMORY")) {
-        PR_Assert("SEC_ERROR_NO_MEMORY: attach minidump to bug 662557", __FILE__, __LINE__);
-    }
     PR_SetError(value, 0);
     return;
 }

security/patches/bug-662557-nss-debug-sec-error-no-memory.patch

@@ -1,27 +0,0 @@
-# HG changeset patch
-# Parent d9973f355dc5d8cc8649fe269561478541c79c99
-# User Brian Smith <bsmith@mozilla.com>
-diff --git a/security/nss/lib/util/secport.c b/security/nss/lib/util/secport.c
---- a/security/nss/lib/util/secport.c
-+++ b/security/nss/lib/util/secport.c
-@@ -175,16 +175,20 @@ PORT_Strdup(const char *str)
- }
- 
- void
- PORT_SetError(int value)
- {	
- #ifdef DEBUG_jp96085
-     PORT_Assert(value != SEC_ERROR_REUSED_ISSUER_AND_SERIAL);
- #endif
-+    if (value == SEC_ERROR_NO_MEMORY &&
-+        PR_GetEnv("NSS_DEBUG_SEC_ERROR_NO_MEMORY")) {
-+        PR_Assert("SEC_ERROR_NO_MEMORY: attach minidump to bug 662557", __FILE__, __LINE__);
-+    }
-     PR_SetError(value, 0);
-     return;
- }
- 
- int
- PORT_GetError(void)
- {
-     return(PR_GetError());