Add GCM, CTR, and CTS modes to AES.

nss/mozilla/security/nss/lib/util/pkcs11t.h

Index: nss/mozilla/security/nss/lib/util/pkcs11t.h
===================================================================
--- nss/mozilla/security/nss/lib/util/pkcs11t.h	(revision 155503)
+++ nss/mozilla/security/nss/lib/util/pkcs11t.h	(working copy)
@@ -918,6 +918,12 @@
 #define CKM_AES_MAC                    0x00001083
 #define CKM_AES_MAC_GENERAL            0x00001084
 #define CKM_AES_CBC_PAD                0x00001085
+/* new for v2.20 amendment 3 */
+#define CKM_AES_CTR                    0x00001086
+/* new for v2.30 */
+#define CKM_AES_GCM                    0x00001087
+#define CKM_AES_CCM                    0x00001088
+#define CKM_AES_CTS                    0x00001089
 
 /* BlowFish and TwoFish are new for v2.20 */
 #define CKM_BLOWFISH_KEY_GEN           0x00001090
@@ -1518,6 +1524,34 @@
 
 typedef CK_AES_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_AES_CBC_ENCRYPT_DATA_PARAMS_PTR;
 
+typedef struct CK_AES_CTR_PARAMS {
+  CK_ULONG     ulCounterBits;
+  CK_BYTE      cb[16];
+} CK_AES_CTR_PARAMS;
+
+typedef CK_AES_CTR_PARAMS CK_PTR CK_AES_CTR_PARAMS_PTR;
+
+typedef struct CK_AES_GCM_PARAMS {
+  CK_BYTE_PTR  pIv;
+  CK_ULONG     ulIvLen;
+  CK_BYTE_PTR  pAAD;
+  CK_ULONG     ulAADLen;
+  CK_ULONG     ulTagBits;
+} CK_AES_GCM_PARAMS;
+
+typedef CK_AES_GCM_PARAMS CK_PTR CK_AES_GCM_PARAMS_PTR;
+
+typedef struct CK_AES_CCM_PARAMS {
+  CK_ULONG     ulDataLen;
+  CK_BYTE_PTR  pNonce;
+  CK_ULONG     ulNonceLen;
+  CK_BYTE_PTR  pAAD;
+  CK_ULONG     ulAADLen;
+  CK_ULONG     ulMACLen;
+} CK_AES_CCM_PARAMS;
+
+typedef CK_AES_CCM_PARAMS CK_PTR CK_AES_CCM_PARAMS_PTR;
+
 /* CK_SKIPJACK_PRIVATE_WRAP_PARAMS provides the parameters to the
  * CKM_SKIPJACK_PRIVATE_WRAP mechanism */
 /* CK_SKIPJACK_PRIVATE_WRAP_PARAMS is new for v2.0 */