Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pk11wrap/secmod.h

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef _SECMOD_H_
 #define _SECMOD_H_
 #include "seccomon.h"
 #include "secmodt.h"
 #include "prinrval.h"
 
 /* These mechanisms flags are visible to all other libraries. */
@@ skipping 46 matching lines @@
 extern SECMODModule *SECMOD_LoadModule(char *moduleSpec,SECMODModule *parent,
                                                         PRBool recurse);
 
 extern SECMODModule *SECMOD_LoadUserModule(char *moduleSpec,SECMODModule *parent,
                                                         PRBool recurse);
 
 SECStatus SECMOD_UnloadUserModule(SECMODModule *mod);
 
 SECMODModule * SECMOD_CreateModule(const char *lib, const char *name,
                                         const char *param, const char *nss);
+SECMODModule * SECMOD_CreateModuleEx(const char *lib, const char *name,
+                                        const char *param, const char *nss,
+                                        const char *config);
 /*
  * After a fork(), PKCS #11 says we need to call C_Initialize again in
  * the child before we can use the module. This function causes this 
  * reinitialization.
  * NOTE: Any outstanding handles will become invalid, which means your
  * keys and contexts will fail, but new ones can be created.
  *
  * Setting 'force' to true means to do the reinitialization even if the 
  * PKCS #11 module does not seem to need it. This allows software modules 
  * which ignore fork to preserve their keys across the fork().
@@ skipping 80 matching lines @@
  * modules to add new slots, but never remove them. Slots not be added between 
  * a call to C_GetSlotLlist(Flag, NULL, &count) and the corresponding
  * C_GetSlotList(flag, &data, &count) so that the array doesn't accidently
  * grow on the caller. It is permissible for the slots to increase between
  * corresponding calls with NULL to get the size.
  */
 SECStatus SECMOD_UpdateSlotList(SECMODModule *mod);
 SEC_END_PROTOS
 
 #endif