Update NSPR to 4.12 and NSS to 3.23 on iOS

patches/nss-static.patch

Index: patches/nss-static.patch
diff --git a/patches/nss-static.patch b/patches/nss-static.patch
index b59b1892b49784469e1953ef9a383a1866567e33..b897b6e4a21c48dfbc2e586d38534793a3d0213e 100644
--- a/patches/nss-static.patch
+++ b/patches/nss-static.patch
@@ -1,7 +1,7 @@
-diff --git a/lib/certhigh/certvfy.c b/lib/certhigh/certvfy.c
-index d5dcbe8..855a62d 100644
---- a/lib/certhigh/certvfy.c
-+++ b/lib/certhigh/certvfy.c
+diff --git a/nss/lib/certhigh/certvfy.c b/nss/lib/certhigh/certvfy.c
+index a86f8a0..eff77fc 100644
+--- a/nss/lib/certhigh/certvfy.c
++++ b/nss/lib/certhigh/certvfy.c
 @@ -12,9 +12,11 @@
  #include "certdb.h"
  #include "certi.h"
@@ -12,9 +12,9 @@ index d5dcbe8..855a62d 100644
  #include "pkix_pl_cert.h"
 +#endif  /* NSS_DISABLE_LIBPKIX */
  
- 
  #include "nsspki.h"
-@@ -24,6 +26,47 @@
+ #include "pkitm.h"
+@@ -23,6 +25,47 @@
  #include "base.h"
  #include "keyhi.h"
  
@@ -62,10 +62,10 @@ index d5dcbe8..855a62d 100644
  /*
   * Check the validity times of a certificate
   */
-diff --git a/lib/ckfw/nssck.api b/lib/ckfw/nssck.api
+diff --git a/nss/lib/ckfw/nssck.api b/nss/lib/ckfw/nssck.api
 index 55b4351..8364258 100644
---- a/lib/ckfw/nssck.api
-+++ b/lib/ckfw/nssck.api
+--- a/nss/lib/ckfw/nssck.api
++++ b/nss/lib/ckfw/nssck.api
 @@ -1752,7 +1752,7 @@ C_WaitForSlotEvent
  }
  #endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
@@ -100,11 +100,11 @@ index 55b4351..8364258 100644
  
  #undef __ADJOIN
  
-diff --git a/lib/freebl/rsa.c b/lib/freebl/rsa.c
-index f885acc..f1824ef 100644
---- a/lib/freebl/rsa.c
-+++ b/lib/freebl/rsa.c
-@@ -1535,6 +1535,13 @@ void BL_Cleanup(void)
+diff --git a/nss/lib/freebl/rsa.c b/nss/lib/freebl/rsa.c
+index 823d8de..48b557b 100644
+--- a/nss/lib/freebl/rsa.c
++++ b/nss/lib/freebl/rsa.c
+@@ -1532,6 +1532,13 @@ void BL_Cleanup(void)
      RSA_Cleanup();
  }
  
@@ -118,10 +118,10 @@ index f885acc..f1824ef 100644
  PRBool bl_parentForkedAfterC_Initialize;
  
  /*
-diff --git a/lib/freebl/shvfy.c b/lib/freebl/shvfy.c
+diff --git a/nss/lib/freebl/shvfy.c b/nss/lib/freebl/shvfy.c
 index ad64a26..33714b8 100644
---- a/lib/freebl/shvfy.c
-+++ b/lib/freebl/shvfy.c
+--- a/nss/lib/freebl/shvfy.c
++++ b/nss/lib/freebl/shvfy.c
 @@ -273,9 +273,21 @@ readItem(PRFileDesc *fd, SECItem *item)
      return SECSuccess;
  }
@@ -168,10 +168,10 @@ index ad64a26..33714b8 100644
  }
  
  PRBool
-diff --git a/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c b/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
-index 30aefb8..ac814cd 100755
---- a/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
-+++ b/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
+diff --git a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
+index 471f920..ecf58ce 100755
+--- a/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
++++ b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
 @@ -201,7 +201,10 @@ certCallback(void *arg, SECItem **secitemCerts, int numcerts)
  
  typedef SECStatus (*pkix_DecodeCertsFunc)(char *certbuf, int certlen,
@@ -205,10 +205,10 @@ index 30aefb8..ac814cd 100755
  }
  
  /*
-diff --git a/lib/nss/nssinit.c b/lib/nss/nssinit.c
-index b22f915..d490037 100644
---- a/lib/nss/nssinit.c
-+++ b/lib/nss/nssinit.c
+diff --git a/nss/lib/nss/nssinit.c b/nss/lib/nss/nssinit.c
+index b73d447..7150cf5 100644
+--- a/nss/lib/nss/nssinit.c
++++ b/nss/lib/nss/nssinit.c
 @@ -20,9 +20,11 @@
  #include "secerr.h"
  #include "nssbase.h"
@@ -258,10 +258,10 @@ index b22f915..d490037 100644
      SECOID_Shutdown();
      status = STAN_Shutdown();
      cert_DestroySubjectKeyIDHashTable();
-diff --git a/lib/pk11wrap/pk11load.c b/lib/pk11wrap/pk11load.c
-index e3ba122..bf7cc68 100644
---- a/lib/pk11wrap/pk11load.c
-+++ b/lib/pk11wrap/pk11load.c
+diff --git a/nss/lib/pk11wrap/pk11load.c b/nss/lib/pk11wrap/pk11load.c
+index 5c5d2ca..bfc4886 100644
+--- a/nss/lib/pk11wrap/pk11load.c
++++ b/nss/lib/pk11wrap/pk11load.c
 @@ -341,6 +341,12 @@ SECMOD_SetRootCerts(PK11SlotInfo *slot, SECMODModule *mod) {
      }
  }
@@ -356,7 +356,7 @@ index e3ba122..bf7cc68 100644
 +#ifndef NSS_STATIC
          if (0 == PR_ATOMIC_DECREMENT(&softokenLoadCount)) {
            if (softokenLib) {
-               disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
+               disableUnload = PR_GetEnvSecure("NSS_DISABLE_UNLOAD");
 @@ -600,12 +633,18 @@ SECMOD_UnloadModule(SECMODModule *mod) {
            }
            loadSoftokenOnce = pristineCallOnce;
@@ -376,10 +376,10 @@ index e3ba122..bf7cc68 100644
  	return SECFailure;
      }
  
-diff --git a/lib/softoken/lgglue.c b/lib/softoken/lgglue.c
-index c7b82bd..64e6415 100644
---- a/lib/softoken/lgglue.c
-+++ b/lib/softoken/lgglue.c
+diff --git a/nss/lib/softoken/lgglue.c b/nss/lib/softoken/lgglue.c
+index 653501c..155991b 100644
+--- a/nss/lib/softoken/lgglue.c
++++ b/nss/lib/softoken/lgglue.c
 @@ -23,6 +23,7 @@ static LGDeleteSecmodFunc legacy_glue_deleteSecmod = NULL;
  static LGAddSecmodFunc legacy_glue_addSecmod = NULL;
  static LGShutdownFunc legacy_glue_shutdown = NULL;
@@ -438,7 +438,7 @@ index c7b82bd..64e6415 100644
  	crv = (*legacy_glue_shutdown)(parentForkedAfterC_Initialize);
      }
 +#ifndef NSS_STATIC
-     disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
+     disableUnload = PR_GetEnvSecure("NSS_DISABLE_UNLOAD");
      if (!disableUnload) {
          PR_UnloadLibrary(legacy_glue_lib);
      }
@@ -446,10 +446,10 @@ index c7b82bd..64e6415 100644
      legacy_glue_lib = NULL;
      legacy_glue_open = NULL;
      legacy_glue_readSecmod = NULL;
-diff --git a/lib/softoken/lgglue.h b/lib/softoken/lgglue.h
+diff --git a/nss/lib/softoken/lgglue.h b/nss/lib/softoken/lgglue.h
 index b87f756..c8c562f 100644
---- a/lib/softoken/lgglue.h
-+++ b/lib/softoken/lgglue.h
+--- a/nss/lib/softoken/lgglue.h
++++ b/nss/lib/softoken/lgglue.h
 @@ -38,6 +38,25 @@ typedef SECStatus (*LGShutdownFunc)(PRBool forked);
  typedef void (*LGSetForkStateFunc)(PRBool);
  typedef void (*LGSetCryptFunc)(LGEncryptFunc, LGDecryptFunc);
@@ -476,10 +476,10 @@ index b87f756..c8c562f 100644
  /*
   * Softoken Glue Functions
   */
-diff --git a/lib/util/secport.h b/lib/util/secport.h
+diff --git a/nss/lib/util/secport.h b/nss/lib/util/secport.h
 index 7d2f5e0..95c73c8 100644
---- a/lib/util/secport.h
-+++ b/lib/util/secport.h
+--- a/nss/lib/util/secport.h
++++ b/nss/lib/util/secport.h
 @@ -223,6 +223,7 @@ extern int NSS_PutEnv(const char * envVarName, const char * envValue);
  
  extern int NSS_SecureMemcmp(const void *a, const void *b, size_t n);