diff options
| author | Darren J Moffat <Darren.Moffat@Sun.COM> | 2010-05-25 02:07:17 -0700 |
|---|---|---|
| committer | Darren J Moffat <Darren.Moffat@Sun.COM> | 2010-05-25 02:07:17 -0700 |
| commit | 00756404c8f37791d5661850515a1be29d414db7 (patch) | |
| tree | cfb872f00b74cff7217eb74e1cc63e4ecac3f24b /usr/src/common/crypto | |
| parent | 27b8c5652b2bbfdd04abdc72da6d1ec1987837a9 (diff) | |
| download | illumos-joyent-00756404c8f37791d5661850515a1be29d414db7.tar.gz | |
6934074 What is an ODE? Shall I compare thee, to a Makefile typo?
6848439 pkcs11_ObjectToKey() arg checks too strict & could be more informative
6739850 CCM fails to update data_processed_len after decrypting remainder
Diffstat (limited to 'usr/src/common/crypto')
| -rw-r--r-- | usr/src/common/crypto/modes/ccm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr/src/common/crypto/modes/ccm.c b/usr/src/common/crypto/modes/ccm.c index 515d64b7a8..d03a73ab04 100644 --- a/usr/src/common/crypto/modes/ccm.c +++ b/usr/src/common/crypto/modes/ccm.c @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. */ #ifndef _KERNEL @@ -430,8 +429,8 @@ ccm_mode_decrypt_contiguous_blocks(ccm_ctx_t *ctx, char *data, size_t length, [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 */ |