Update NSS to 3.21 RTM and NSPR to 4.11 RTM

patches/nss-static.patch

-diff --git a/nss/lib/certhigh/certvfy.c b/nss/lib/certhigh/certvfy.c
-index 3141163..c9d26f0 100644
---- a/nss/lib/certhigh/certvfy.c
-+++ b/nss/lib/certhigh/certvfy.c
-@@ -13,9 +13,11 @@
+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
+@@ -12,9 +12,11 @@
  #include "certdb.h"
  #include "certi.h"
  #include "cryptohi.h"
 +#ifndef NSS_DISABLE_LIBPKIX
  #include "pkix.h"
  /*#include "pkix_sample_modules.h" */
  #include "pkix_pl_cert.h"
 +#endif  /* NSS_DISABLE_LIBPKIX */
  
  
  #include "nsspki.h"
 @@ -24,6 +26,47 @@
- #include "pki3hack.h"
  #include "base.h"
+ #include "keyhi.h"
  
 +#ifdef NSS_DISABLE_LIBPKIX
 +SECStatus
 +cert_VerifyCertChainPkix(
 +    CERTCertificate *cert,
 +    PRBool           checkSig,
 +    SECCertUsage     requiredUsage,
 +    PRTime           time,
 +    void            *wincx,
 +    CERTVerifyLog   *log,
@@ skipping 25 matching lines @@
 +    void *wincx)
 +{
 +    PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
 +    return SECFailure;
 +}
 +#endif  /* NSS_DISABLE_LIBPKIX */
 +
  /*
   * Check the validity times of a certificate
   */
-diff --git a/nss/lib/ckfw/nssck.api b/nss/lib/ckfw/nssck.api
+diff --git a/lib/ckfw/nssck.api b/lib/ckfw/nssck.api
 index 55b4351..8364258 100644
---- a/nss/lib/ckfw/nssck.api
-+++ b/nss/lib/ckfw/nssck.api
+--- a/lib/ckfw/nssck.api
++++ b/lib/ckfw/nssck.api
 @@ -1752,7 +1752,7 @@ C_WaitForSlotEvent
  }
  #endif /* DECLARE_STRICT_CRYPTOKI_NAMES */
  
 -static CK_RV CK_ENTRY
 +CK_RV CK_ENTRY
  __ADJOIN(MODULE_NAME,C_GetFunctionList)
  (
    CK_FUNCTION_LIST_PTR_PTR ppFunctionList
 @@ -1830,7 +1830,7 @@ __ADJOIN(MODULE_NAME,C_CancelFunction),
@@ skipping 14 matching lines @@
  CK_RV CK_ENTRY
  C_GetFunctionList
 @@ -1849,6 +1850,7 @@ C_GetFunctionList
  {
    return __ADJOIN(MODULE_NAME,C_GetFunctionList)(ppFunctionList);
  }
 +#endif
  
  #undef __ADJOIN
  
-diff --git a/nss/lib/freebl/rsa.c b/nss/lib/freebl/rsa.c
-index 498cc96..780c3c7 100644
---- a/nss/lib/freebl/rsa.c
-+++ b/nss/lib/freebl/rsa.c
+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)
      RSA_Cleanup();
  }
  
 +#ifdef NSS_STATIC
 +void
 +BL_Unload(void)
 +{
 +}
 +#endif
 +
  PRBool bl_parentForkedAfterC_Initialize;
  
  /*
-diff --git a/nss/lib/freebl/shvfy.c b/nss/lib/freebl/shvfy.c
+diff --git a/lib/freebl/shvfy.c b/lib/freebl/shvfy.c
 index ad64a26..33714b8 100644
---- a/nss/lib/freebl/shvfy.c
-+++ b/nss/lib/freebl/shvfy.c
+--- a/lib/freebl/shvfy.c
++++ b/lib/freebl/shvfy.c
 @@ -273,9 +273,21 @@ readItem(PRFileDesc *fd, SECItem *item)
      return SECSuccess;
  }
  
 +/*
 + * Define PSEUDO_FIPS if you can't do FIPS software integrity test (e.g.,
 + * if you're using NSS as static libraries), but want to conform to the
 + * rest of the FIPS requirements.
 + */
 +#ifdef NSS_STATIC
@@ skipping 26 matching lines @@
      PRFileDesc *checkFD = NULL;
      PRFileDesc *shFD = NULL;
 @@ -492,6 +508,7 @@ loser:
      }
  
      return result;
 +#endif  /* PSEUDO_FIPS */
  }
  
  PRBool
-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
+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/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
-+++ b/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
+--- a/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
++++ b/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,
                                            CERTImportCertificateFunc f, void *arg);
 -
 +#ifdef NSS_STATIC
 +extern SECStatus CERT_DecodeCertPackage(char* certbuf, int certlen,
 +                                        CERTImportCertificateFunc f, void* arg);
 +#endif
  
@@ skipping 13 matching lines @@
      if (pkix_decodeFunc.smimeLib == NULL) {
 @@ -235,7 +243,7 @@ static PRStatus PR_CALLBACK pkix_getDecodeFunction(void)
         return PR_FAILURE;
      }
      return PR_SUCCESS;
 -
 +#endif
  }
  
  /*
-diff --git a/nss/lib/nss/nssinit.c b/nss/lib/nss/nssinit.c
-index 6218a7e..208e71d 100644
---- a/nss/lib/nss/nssinit.c
-+++ b/nss/lib/nss/nssinit.c
+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
 @@ -20,9 +20,11 @@
  #include "secerr.h"
  #include "nssbase.h"
  #include "nssutil.h"
 +#ifndef NSS_DISABLE_LIBPKIX
  #include "pkixt.h"
  #include "pkix.h"
  #include "pkix_tools.h"
 +#endif  /* NSS_DISABLE_LIBPKIX */
  
  #include "pki3hack.h"
  #include "certi.h"
-@@ -530,8 +532,10 @@ nss_Init(const char *configdir, const char *certPrefix, const char *keyPrefix,
+@@ -526,8 +528,10 @@ nss_Init(const char *configdir, const char *certPrefix, const char *keyPrefix,
                  PRBool dontFinalizeModules)
  {
      SECStatus rv = SECFailure;
 +#ifndef NSS_DISABLE_LIBPKIX
      PKIX_UInt32 actualMinorVersion = 0;
      PKIX_Error *pkixError = NULL;
 +#endif
      PRBool isReallyInitted;
      char *configStrings = NULL;
      char *configName = NULL;
-@@ -685,6 +689,7 @@ nss_Init(const char *configdir, const char *certPrefix, const char *keyPrefix,
+@@ -684,6 +688,7 @@ nss_Init(const char *configdir, const char *certPrefix, const char *keyPrefix,
         pk11sdr_Init();
         cert_CreateSubjectKeyIDHashTable();
  
 +#ifndef NSS_DISABLE_LIBPKIX
         pkixError = PKIX_Initialize
             (PKIX_FALSE, PKIX_MAJOR_VERSION, PKIX_MINOR_VERSION,
             PKIX_MINOR_VERSION, &actualMinorVersion, &plContext);
-@@ -697,6 +702,7 @@ nss_Init(const char *configdir, const char *certPrefix, const char *keyPrefix,
+@@ -696,6 +701,7 @@ nss_Init(const char *configdir, const char *certPrefix, const char *keyPrefix,
                  CERT_SetUsePKIXForValidation(PR_TRUE);
              }
          }
 +#endif  /* NSS_DISABLE_LIBPKIX */
  
  
      }
-@@ -1081,7 +1087,9 @@ nss_Shutdown(void)
+@@ -1080,7 +1086,9 @@ nss_Shutdown(void)
      cert_DestroyLocks();
      ShutdownCRLCache();
      OCSP_ShutdownGlobal();
 +#ifndef NSS_DISABLE_LIBPKIX
      PKIX_Shutdown(plContext);
 +#endif
      SECOID_Shutdown();
      status = STAN_Shutdown();
      cert_DestroySubjectKeyIDHashTable();
-diff --git a/nss/lib/pk11wrap/pk11load.c b/nss/lib/pk11wrap/pk11load.c
-index 6700180..1811a1a 100644
---- a/nss/lib/pk11wrap/pk11load.c
-+++ b/nss/lib/pk11wrap/pk11load.c
+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
 @@ -341,6 +341,12 @@ SECMOD_SetRootCerts(PK11SlotInfo *slot, SECMODModule *mod) {
      }
  }
  
 +#ifdef NSS_STATIC
 +extern CK_RV NSC_GetFunctionList(CK_FUNCTION_LIST_PTR *pFunctionList);
 +extern CK_RV FC_GetFunctionList(CK_FUNCTION_LIST_PTR *pFunctionList);
 +extern char **NSC_ModuleDBFunc(unsigned long function,char *parameters, void *args);
 +extern CK_RV builtinsC_GetFunctionList(CK_FUNCTION_LIST_PTR *pFunctionList);
 +#else
@@ skipping 75 matching lines @@
         if (entry == NULL) {
             if (mod->isModuleDB) {
 @@ -585,6 +617,7 @@ SECMOD_UnloadModule(SECMODModule *mod) {
       * if not, we should change this to SECFailure and move it above the
       * mod->loaded = PR_FALSE; */
      if (mod->internal && (mod->dllName == NULL)) {
 +#ifndef NSS_STATIC
          if (0 == PR_ATOMIC_DECREMENT(&softokenLoadCount)) {
            if (softokenLib) {
                disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
-@@ -596,12 +629,18 @@ SECMOD_UnloadModule(SECMODModule *mod) {
+@@ -600,12 +633,18 @@ SECMOD_UnloadModule(SECMODModule *mod) {
            }
            loadSoftokenOnce = pristineCallOnce;
          }
 +#endif
         return SECSuccess;
      }
  
      library = (PRLibrary *)mod->library;
      /* paranoia */
      if (library == NULL) {
 +#if defined(NSS_STATIC) && !defined(NSS_DISABLE_ROOT_CERTS)
 +       if (strstr(mod->dllName, "nssckbi") != NULL) {
 +           return SECSuccess;
 +       }
 +#endif
         return SECFailure;
      }
  
-diff --git a/nss/lib/softoken/lgglue.c b/nss/lib/softoken/lgglue.c
+diff --git a/lib/softoken/lgglue.c b/lib/softoken/lgglue.c
 index c7b82bd..64e6415 100644
---- a/nss/lib/softoken/lgglue.c
-+++ b/nss/lib/softoken/lgglue.c
+--- a/lib/softoken/lgglue.c
++++ b/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;
  
 +#ifndef NSS_STATIC
  /*
   * The following 3 functions duplicate the work done by bl_LoadLibrary.
   * We should make bl_LoadLibrary a global and replace the call to
 @@ -160,6 +161,7 @@ done:
  
@@ skipping 46 matching lines @@
      }
 +#ifndef NSS_STATIC
      disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
      if (!disableUnload) {
          PR_UnloadLibrary(legacy_glue_lib);
      }
 +#endif
      legacy_glue_lib = NULL;
      legacy_glue_open = NULL;
      legacy_glue_readSecmod = NULL;
-diff --git a/nss/lib/softoken/lgglue.h b/nss/lib/softoken/lgglue.h
+diff --git a/lib/softoken/lgglue.h b/lib/softoken/lgglue.h
 index b87f756..c8c562f 100644
---- a/nss/lib/softoken/lgglue.h
-+++ b/nss/lib/softoken/lgglue.h
+--- a/lib/softoken/lgglue.h
++++ b/lib/softoken/lgglue.h
 @@ -38,6 +38,25 @@ typedef SECStatus (*LGShutdownFunc)(PRBool forked);
  typedef void (*LGSetForkStateFunc)(PRBool);
  typedef void (*LGSetCryptFunc)(LGEncryptFunc, LGDecryptFunc);
  
 +extern CK_RV legacy_Open(const char *dir, const char *certPrefix, 
 +               const char *keyPrefix, 
 +               int certVersion, int keyVersion, int flags, 
 +               SDB **certDB, SDB **keyDB);
 +extern char ** legacy_ReadSecmodDB(const char *appName, 
 +                       const char *filename, 
 +                       const char *dbname, char *params, PRBool rw);
 +extern SECStatus legacy_ReleaseSecmodDBData(const char *appName,
 +                       const char *filename, 
 +                       const char *dbname, char **params, PRBool rw);
 +extern SECStatus legacy_DeleteSecmodDB(const char *appName,
 +                       const char *filename, 
 +                       const char *dbname, char *params, PRBool rw);
 +extern SECStatus legacy_AddSecmodDB(const char *appName, 
 +                       const char *filename, 
 +                       const char *dbname, char *params, PRBool rw);
 +extern SECStatus legacy_Shutdown(PRBool forked);
 +extern void legacy_SetCryptFunctions(LGEncryptFunc, LGDecryptFunc);
 +
  /*
   * Softoken Glue Functions
   */
-diff --git a/nss/lib/util/secport.h b/nss/lib/util/secport.h
-index 5b09b9c..f01eb74 100644
---- a/nss/lib/util/secport.h
-+++ b/nss/lib/util/secport.h
-@@ -210,6 +210,7 @@ extern int NSS_PutEnv(const char * envVarName, const char * envValue);
+diff --git a/lib/util/secport.h b/lib/util/secport.h
+index 7d2f5e0..95c73c8 100644
+--- a/lib/util/secport.h
++++ b/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);
  
 +#ifndef NSS_STATIC
  /*
   * Load a shared library called "newShLibName" in the same directory as
   * a shared library that is already loaded, called existingShLibName.
-@@ -244,6 +245,7 @@ PRLibrary *
+@@ -257,6 +258,7 @@ PRLibrary *
  PORT_LoadLibraryFromOrigin(const char* existingShLibName,
                   PRFuncPtr staticShLibFunc,
                   const char *newShLibName);
 +#endif  /* NSS_STATIC */
  
  SEC_END_PROTOS