diff options
| author | Raimo Niskanen <raimo@erlang.org> | 2023-04-27 18:49:18 +0200 |
|---|---|---|
| committer | Raimo Niskanen <raimo@erlang.org> | 2023-04-27 19:13:27 +0200 |
| commit | f382175f7439451a8726f2f3b3cf8ee06f224aa8 (patch) | |
| tree | 5f085d58801360d193f8dc6817882112fa6501ab | |
| parent | 1057cd433f18bf592815fac9d12e96d5202f5554 (diff) | |
| download | erlang-f382175f7439451a8726f2f3b3cf8ee06f224aa8.tar.gz | |
CMAC is only possible with CBC mode
| -rw-r--r-- | lib/crypto/src/crypto.erl | 4 | ||||
| -rw-r--r-- | lib/crypto/test/crypto_SUITE.erl | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl index 53cdc76830..431ebbfaa5 100644 --- a/lib/crypto/src/crypto.erl +++ b/lib/crypto/src/crypto.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2022. All Rights Reserved. +%% Copyright Ericsson AB 1999-2023. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -669,8 +669,6 @@ hash_final(Context) -> -type hmac_hash_algorithm() :: sha1() | sha2() | sha3() | compatibility_only_hash(). -type cmac_cipher_algorithm() :: aes_128_cbc | aes_192_cbc | aes_256_cbc | aes_cbc - | aes_128_cfb128 | aes_192_cfb128 | aes_256_cfb128 | aes_cfb128 - | aes_128_cfb8 | aes_192_cfb8 | aes_256_cfb8 | aes_cfb8 | blowfish_cbc | des_cbc | des_ede3_cbc | rc2_cbc diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl index 52722cb5a8..51fd93a6d8 100644 --- a/lib/crypto/test/crypto_SUITE.erl +++ b/lib/crypto/test/crypto_SUITE.erl @@ -411,14 +411,14 @@ groups() -> {des_ede3_cfb, [], [api_ng, api_ng_one_shot, api_ng_tls]}, {rc2_cbc, [], [api_ng, api_ng_one_shot, api_ng_tls, cmac, cmac_update]}, {aes_cfb8, [], []}, - {aes_128_cfb8, [], [api_ng, api_ng_one_shot, api_ng_tls, cmac, cmac_update]}, - {aes_192_cfb8, [], [api_ng, api_ng_one_shot, api_ng_tls, cmac, cmac_update]}, - {aes_256_cfb8, [], [api_ng, api_ng_one_shot, api_ng_tls, cmac, cmac_update]}, + {aes_128_cfb8, [], [api_ng, api_ng_one_shot, api_ng_tls]}, + {aes_192_cfb8, [], [api_ng, api_ng_one_shot, api_ng_tls]}, + {aes_256_cfb8, [], [api_ng, api_ng_one_shot, api_ng_tls]}, {no_aes_cfb8, [], [no_support]}, {aes_cfb128, [], []}, - {aes_128_cfb128, [], [api_ng, api_ng_one_shot, api_ng_tls, cmac, cmac_update]}, - {aes_192_cfb128, [], [api_ng, api_ng_one_shot, api_ng_tls, cmac, cmac_update]}, - {aes_256_cfb128, [], [api_ng, api_ng_one_shot, api_ng_tls, cmac, cmac_update]}, + {aes_128_cfb128, [], [api_ng, api_ng_one_shot, api_ng_tls]}, + {aes_192_cfb128, [], [api_ng, api_ng_one_shot, api_ng_tls]}, + {aes_256_cfb128, [], [api_ng, api_ng_one_shot, api_ng_tls]}, {no_aes_cfb128, [], [no_support]}, {blowfish_cbc, [], [api_ng, api_ng_one_shot, api_ng_tls, cmac, cmac_update]}, {blowfish_ecb, [], [api_ng, api_ng_one_shot]}, |