Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/nss/nssinit.c

 /*
  * NSS utility functions
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
@@ skipping 18 matching lines @@
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: nssinit.c,v 1.105 2010/01/22 02:10:54 wtc%google.com Exp $ */
+/* $Id: nssinit.c,v 1.106 2010/04/03 20:06:00 nelson%bolyard.com Exp $ */
 
 #include <ctype.h>
 #include <string.h>
 #include "seccomon.h"
 #include "prinit.h"
 #include "prprf.h"
 #include "prmem.h"
 #include "cert.h"
 #include "key.h"
 #include "secmod.h"
@@ skipping 528 matching lines @@
     if (noSingleThreadedModules || allowAlreadyInitializedModules ||
         dontFinalizeModules) {
         pk11_setGlobalOptions(noSingleThreadedModules,
                               allowAlreadyInitializedModules,
                               dontFinalizeModules);
     }
 
     if (initContextPtr) {
         *initContextPtr = PORT_ZNew(NSSInitContext);
         if (*initContextPtr == NULL) {
-            return SECFailure;
+            goto loser;
         }
         /*
          * For traditional NSS_Init, we used the PK11_Configure() call to set
          * globals. with InitContext, we pass those strings in as parameters.
          *
          * This allows old NSS_Init calls to work as before, while at the same
          * time new calls and old calls will not interfere with each other.
          */
         if (initParams) {
             if (initParams->length < sizeof(NSSInitParameters)) {
                 PORT_SetError(SEC_ERROR_INVALID_ARGS);
-                return SECFailure;
+                goto loser;
             }
             configStrings = nss_MkConfigString(initParams->manufactureID,
                 initParams->libraryDescription,
                 initParams->cryptoTokenDescription,
                 initParams->dbTokenDescription,
                 initParams->cryptoSlotDescription,
                 initParams->dbSlotDescription,
                 initParams->FIPSSlotDescription,
                 initParams->FIPSTokenDescription,
                 initParams->minPWLen);
             if (configStrings == NULL) {
                 PORT_SetError(SEC_ERROR_NO_MEMORY);
-                return SECFailure;
+                goto loser;
             }
             configName = initParams->libraryDescription;
             passwordRequired = initParams->passwordRequired;
         }
     } else {
         configStrings = pk11_config_strings;
         configName = pk11_config_name;
         passwordRequired = pk11_password_required;
     }
 
@@ skipping 582 matching lines @@
     if (vmajor == NSS_VMAJOR && vminor == NSS_VMINOR &&
         vpatch == NSS_VPATCH && vbuild > NSS_VBUILD) {
         return PR_FALSE;
     }
     /* Check dependent libraries */
     if (PR_VersionCheck(PR_VERSION) == PR_FALSE) {
         return PR_FALSE;
     }
     return PR_TRUE;
 }