diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-10 11:40:54 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-06-10 11:40:54 +0000 |
| commit | 63df3c3c8929c01d7a3146067c208ed7804e4aa6 (patch) | |
| tree | 0d83d002c5b34c16d85633016515678adbb4cb7d | |
| parent | b275617196ccddbac9acfc6581cf75c0e3fb4250 (diff) | |
| parent | eb7a235af24981be82a88a125b4f82093a408ef4 (diff) | |
| download | illumos-joyent-63df3c3c8929c01d7a3146067c208ed7804e4aa6.tar.gz | |
[illumos-gate merge]
commit eb7a235af24981be82a88a125b4f82093a408ef4
commit 82c3f1a85d940e88355a055831c2d279c69c59e6
12390 AES: aes_mech_info_tab error
commit d9660a7c6537b3e744aca576d92fcef0d6efcea2
12817 ucode/update.intel should be able to use git repos
commit 16b19c8cd6c6339e907197a5a8c30bdb85ec0ef8
12815 ucode/update.intel needs pkgfmt fix
| -rw-r--r-- | usr/src/uts/common/crypto/io/aes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/crypto/io/aes.c b/usr/src/uts/common/crypto/io/aes.c index e487fe8baf..4b5f110ad2 100644 --- a/usr/src/uts/common/crypto/io/aes.c +++ b/usr/src/uts/common/crypto/io/aes.c @@ -75,7 +75,7 @@ static crypto_mech_info_t aes_mech_info_tab[] = { /* AES_CMAC */ {SUN_CKM_AES_CMAC, AES_CMAC_MECH_INFO_TYPE, CRYPTO_FG_ENCRYPT | CRYPTO_FG_ENCRYPT_ATOMIC | - CRYPTO_FG_MAC | CRYPTO_FG_MAC_ATOMIC | + CRYPTO_FG_MAC | CRYPTO_FG_MAC_ATOMIC, AES_MIN_KEY_BYTES, AES_MAX_KEY_BYTES, CRYPTO_KEYSIZE_UNIT_IN_BYTES}, /* AES_CTR */ {SUN_CKM_AES_CTR, AES_CTR_MECH_INFO_TYPE, |