Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/cryptohi/keythi.h

 /* ***** 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 24 matching lines @@
  *
  * ***** END LICENSE BLOCK ***** */
 #ifndef _KEYTHI_H_
 #define _KEYTHI_H_ 1
 
 #include "plarena.h"
 #include "pkcs11t.h"
 #include "secmodt.h"
 #include "prclist.h"
 
+/*
+** RFC 4055 specifies three different RSA key types.
+**
+** rsaKey maps to keys with SEC_OID_PKCS1_RSA_ENCRYPTION and can be used for
+** both encryption and signatures with old (PKCS #1 v1.5) and new (PKCS #1
+** v2.1) padding schemes.
+**
+** rsaPssKey maps to keys with SEC_OID_PKCS1_RSA_PSS_SIGNATURE and may only
+** be used for signatures with PSS padding (PKCS #1 v2.1).
+**
+** rsaOaepKey maps to keys with SEC_OID_PKCS1_RSA_OAEP_ENCRYPTION and may only
+** be used for encryption with OAEP padding (PKCS #1 v2.1).
+*/ 
+
 typedef enum { 
     nullKey = 0, 
     rsaKey = 1, 
     dsaKey = 2, 
     fortezzaKey = 3,
     dhKey = 4, 
     keaKey = 5,
-    ecKey = 6
+    ecKey = 6,
+    rsaPssKey = 7,
+    rsaOaepKey = 8
 } KeyType;
 
 /*
 ** Template Definitions
 **/
 
 SEC_BEGIN_PROTOS
 extern const SEC_ASN1Template SECKEY_RSAPublicKeyTemplate[];
 extern const SEC_ASN1Template SECKEY_DSAPublicKeyTemplate[];
 extern const SEC_ASN1Template SECKEY_DHPublicKeyTemplate[];
@@ skipping 88 matching lines @@
     unsigned char    KMID[8];
     SECItem clearance;
     SECItem KEApriviledge;
     SECItem DSSpriviledge;
     SECItem KEAKey;
     SECItem DSSKey;
     SECKEYPQGParams params;
     SECKEYPQGParams keaParams;
 };
 typedef struct SECKEYFortezzaPublicKeyStr SECKEYFortezzaPublicKey;
+#define KEAprivilege KEApriviledge /* corrected spelling */
+#define DSSprivilege DSSpriviledge /* corrected spelling */
 
 struct SECKEYDiffPQGParamsStr {
     SECKEYPQGParams DiffKEAParams;
     SECKEYPQGParams DiffDSAParams;
 };
 typedef struct SECKEYDiffPQGParamsStr SECKEYDiffPQGParams;
 
 struct SECKEYPQGDualParamsStr {
     SECKEYPQGParams CommParams;
     SECKEYDiffPQGParams DiffParams;
@@ skipping 75 matching lines @@
     PRCList links;
     SECKEYPublicKey *key;
 } SECKEYPublicKeyListNode;
 
 typedef struct {
     PRCList list;
     PLArenaPool *arena;
 } SECKEYPublicKeyList;
 #endif /* _KEYTHI_H_ */