diff options
| author | Jason King <jason.king@joyent.com> | 2018-01-25 18:49:57 +0000 |
|---|---|---|
| committer | Jason King <jason.king@joyent.com> | 2018-10-04 21:14:57 -0500 |
| commit | 80ecbe59bad54b13cd87628cff232f7fd4335b4b (patch) | |
| tree | 22a630e6c4ffef3ea824cba5374c9d2b4d233464 /usr/src/common/crypto/modes/modes.h | |
| parent | 4c14c4cff5adaaa79d7099e153c3ace3a0d65148 (diff) | |
| download | illumos-joyent-80ecbe59bad54b13cd87628cff232f7fd4335b4b.tar.gz | |
OS-6576 Add CCM and GCM mode support to AES in pkcs11_softtokenOS-6576
Reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/common/crypto/modes/modes.h')
| -rw-r--r-- | usr/src/common/crypto/modes/modes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/common/crypto/modes/modes.h b/usr/src/common/crypto/modes/modes.h index efb3770eea..0ad18b0c25 100644 --- a/usr/src/common/crypto/modes/modes.h +++ b/usr/src/common/crypto/modes/modes.h @@ -23,6 +23,7 @@ * Use is subject to license terms. * * Copyright 2014 Nexenta Systems, Inc. All rights reserved. + * Copyright (c) 2018, Joyent, Inc. */ #ifndef _COMMON_CRYPTO_MODES_H @@ -241,15 +242,14 @@ typedef struct aes_ctx { ecb_ctx_t acu_ecb; cbc_ctx_t acu_cbc; ctr_ctx_t acu_ctr; -#ifdef _KERNEL ccm_ctx_t acu_ccm; gcm_ctx_t acu_gcm; -#endif } acu; } aes_ctx_t; #define ac_flags acu.acu_ecb.ecb_common.cc_flags #define ac_remainder_len acu.acu_ecb.ecb_common.cc_remainder_len +#define ac_remainder acu.acu_ecb.ecb_common.cc_remainder #define ac_keysched acu.acu_ecb.ecb_common.cc_keysched #define ac_keysched_len acu.acu_ecb.ecb_common.cc_keysched_len #define ac_iv acu.acu_ecb.ecb_common.cc_iv |