--- aes_cbc_crypt.h.old	Wed May  9 17:04:53 2007
+++ aes_cbc_crypt.h.new	Wed May  9 17:04:21 2007
@@ -1,118 +1,172 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License, Version 1.0 only
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef	_AES_CBC_CRYPT_H
 #define	_AES_CBC_CRYPT_H
 
-#pragma ident	"@(#)aes_cbc_crypt.h	1.3	05/11/11 SMI"
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
 #include <sys/crypto/common.h>
 #include "aes_impl.h"
 
 /*
  * ac_keysched:		Pointer to key schedule.
  *
  * ac_keysched_len:	Length of the key schedule.
  *
  * ac_remainder:	This is for residual data, i.e. data that can't
  *			be processed because there are too few bytes.
  *			Must wait until more data arrives.
  *
  * ac_remainder_len:	Number of bytes in ac_remainder.
  *
  * ac_iv:		Scratch buffer that sometimes contains the IV.
  *
  * ac_lastblock:	Scratch buffer.
  *
  * ac_lastp:		Pointer to previous block of ciphertext.
  *
  * ac_copy_to:		Pointer to where encrypted residual data needs
  *			to be copied.
  *
  * ac_flags:		AES_PROVIDER_OWNS_KEY_SCHEDULE
  *			When a context is freed, it is necessary
  *			to know whether the key schedule was allocated
  *			by the caller, or by aes_encrypt_init() or
  *			aes_decrypt_init().  If allocated by the latter,
  *			then it needs to be freed.
  *
  *			AES_ECB_MODE, AES_CBC_MODE, or AES_CTR_MODE
+ *			AES_CCM_MODE
+ *
+ * ac_ccm_mac_len:	Stores length of the MAC in CCM mode
+ * ac_ccm_mac_buf:	Stores the intermediate value for MAC in CCM encrypt
+ *			In CCM decrypt, stores the input MAC value
+ * ac_ccm_data_len:	Length of the plaintext for CCM mode encrypt, or
+ *			length of the ciphertext for CCM mode decrypt
+ * ac_ccm_processed_data_len:
+ *			Length of processed plaintext in CCM mode encrypt,
+ *			or length of processed ciphertex for CCM mode decrypt
+ * ac_ccm_processed_mac_len:
+ *			Length of MAC data accumulated in CCM mode decrypt
+ *			
+ * ac_ccm_pt_buf:	Only used in CCM mode decrypt.  It stores the
+ *			decrypted plaintext to be returned when
+ *			MAC verification succeeds in decrypt_final.
+ *			Memory for this should be allocated in the AES module.
+ *
  */
 typedef struct aes_ctx {
 	void *ac_keysched;
 	size_t ac_keysched_len;
 	uint64_t ac_iv[2];
 	uint64_t ac_lastblock[2];
 	uint64_t ac_remainder[2];
 	size_t ac_remainder_len;
 	uint8_t *ac_lastp;
 	uint8_t *ac_copy_to;
 	uint32_t ac_flags;
+	size_t ac_ccm_mac_len;
+	uint8_t ac_ccm_mac_buf[AES_BLOCK_LEN];
+	size_t ac_ccm_data_len;
+	size_t ac_ccm_processed_data_len;
+	size_t ac_ccm_processed_mac_len;
+	uint8_t *ac_ccm_pt_buf;
+	size_t ac_ccm_mac_input_buf[AES_BLOCK_LEN];
 } aes_ctx_t;
 
 /*
  * ac_cb		Counter block.
  *
  * ac_counter_mask	Mask of counter bits in the last 8 bytes of the
  * 			counter block.
  */
 #define	ac_cb		ac_iv
 #define	ac_counter_mask	ac_lastblock[0]
 
 #define	AES_PROVIDER_OWNS_KEY_SCHEDULE	0x00000001
 #define	AES_ECB_MODE			0x00000002
 #define	AES_CBC_MODE			0x00000004
 #define	AES_CTR_MODE			0x00000008
+#define	AES_CCM_MODE			0x00000010
 
 /* CK_AES_CTR_PARAMS provides parameters to the CKM_AES_CTR mechanism */
 typedef struct CK_AES_CTR_PARAMS {
 	ulong_t	ulCounterBits;
 	uchar_t *cb;
 } CK_AES_CTR_PARAMS;
 
+/* CK_AES_CCM_PARAMS provides parameters to the CKM_AES_CCM mechanism */
+typedef struct CK_AES_CCM_PARAMS {
+	ulong_t ulMACSize;
+	ulong_t ulNonceSize;
+	ulong_t ulAuthDataSize;
+	ulong_t ulDataSize; /* used for plaintext or ciphertext */
+	uchar_t *nonce;
+	uchar_t *authData;
+} CK_AES_CCM_PARAMS;
+
+
 #ifdef _KERNEL
 /* needed for 32-bit applications running on 64-bit kernels */
 typedef struct CK_AES_CTR_PARAMS32 {
 	uint32_t ulCounterBits;
 	caddr32_t cb;
 } CK_AES_CTR_PARAMS32;
 #endif /* _KERNEL */
 
+#ifdef _KERNEL
+/* needed for 32-bit applications running on 64-bit kernels */
+typedef struct CK_AES_CCM_PARAMS32 {
+	uint32_t ulMACSize;
+	uint32_t ulNonceSize;
+	uint32_t ulAuthDataSize;
+	uint32_t ulDataSize;
+	caddr32_t nonce;
+	caddr32_t authData;
+} CK_AES_CCM_PARAMS32;
+#endif /* _KERNEL */
+
 extern int aes_encrypt_contiguous_blocks(aes_ctx_t *, char *, size_t,
     crypto_data_t *);
 extern int aes_decrypt_contiguous_blocks(aes_ctx_t *, char *, size_t,
     crypto_data_t *);
 extern int aes_counter_final(aes_ctx_t *, crypto_data_t *);
+extern int aes_ccm_init(aes_ctx_t *, unsigned char *, size_t,
+    unsigned char *, size_t);
+extern int aes_ccm_validate_args(CK_AES_CCM_PARAMS *, boolean_t);
+extern int aes_ccm_encrypt_final(aes_ctx_t *, crypto_data_t *);
+extern int aes_ccm_decrypt_final(aes_ctx_t *, crypto_data_t *);
 
 #ifdef	__cplusplus
 }
 #endif
 
 #endif	/* _AES_CBC_CRYPT_H */