Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/pk11wrap/pk11akey.c

 /* ***** 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/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 1136 matching lines @@
     /* subset of attrFlags applicable to the public key */
     PK11AttrFlags pubKeyAttrFlags = attrFlags &
         (PK11_ATTR_TOKEN | PK11_ATTR_SESSION
         | PK11_ATTR_MODIFIABLE | PK11_ATTR_UNMODIFIABLE);
 
     if (pk11_BadAttrFlags(attrFlags)) {
         PORT_SetError( SEC_ERROR_INVALID_ARGS );
         return NULL;
     }
 
+    if (!param) {
+        PORT_SetError( SEC_ERROR_INVALID_ARGS );
+        return NULL;
+    }
+
     /*
      * The opFlags and opFlagMask parameters allow us to control the
      * settings of the key usage attributes (CKA_ENCRYPT and friends).
      * opFlagMask is set to one if the flag is specified in opFlags and 
      *  zero if it is to take on a default value calculated by 
      *  PK11_GenerateKeyPairWithOpFlags.
      * opFlags specifies the actual value of the flag 1 or 0. 
      *   Bits not corresponding to one bits in opFlagMask should be zero.
      */
 
@@ skipping 1211 matching lines @@
     for (i=0; i < objCount ; i++) {
         SECKEYPrivateKey *privKey = 
                 PK11_MakePrivKey(slot,nullKey,PR_TRUE,key_ids[i],wincx);
         SECKEY_AddPrivateKeyToListTail(keys, privKey);
    }
 
    PORT_Free(key_ids);
    return keys;
 }