--- old/usr/src/common/crypto/modes/ccm.c	Tue Feb  3 13:17:24 2009
+++ new/usr/src/common/crypto/modes/ccm.c	Tue Feb  3 13:17:23 2009
@@ -435,8 +435,8 @@
 			    [ctx->ccm_remainder_len], pt_part);
 			ctx->ccm_remainder_len += pt_part;
 			ccm_decrypt_incomplete_block(ctx, encrypt_block);
+			ctx->ccm_processed_data_len += ctx->ccm_remainder_len;
 			ctx->ccm_remainder_len = 0;
-			ctx->ccm_processed_data_len += pt_part;
 			return (CRYPTO_SUCCESS);
 		} else {
 			/* let rest of the code handle this */