Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/pk11wrap/pk11skey.c

 /* 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/. */
 /*
  * This file implements the Symkey wrapper and the PKCS context
  * Interfaces.
  */
 
 #include "seccomon.h"
 #include "secmod.h"
@@ skipping 1803 matching lines @@
     /* get our key Structure */
     symKey = pk11_CreateSymKey(slot, target, PR_TRUE, PR_TRUE, wincx);
     if (symKey == NULL) {
         return NULL;
     }
 
     symKey->origin = PK11_OriginDerive;
 
     switch (privKey->keyType) {
     case rsaKey:
+    case rsaPssKey:
+    case rsaOaepKey:
     case nullKey:
         PORT_SetError(SEC_ERROR_BAD_KEY);
         break;
     case dsaKey:
     case keaKey:
     case fortezzaKey:
         {
             CK_KEA_DERIVE_PARAMS param;
             param.isSender = (CK_BBOOL) isSender;
             param.ulRandomLen = randomA->len;
@@ skipping 827 matching lines @@
     PK11_ExitSlotMonitor(symKey->slot);
     return rv;
 }
 
 CK_OBJECT_HANDLE
 PK11_GetSymKeyHandle(PK11SymKey *symKey)
 {
     return symKey->objectID;
 }