diff options
| author | Hans Nilsson <[email protected]> | 2019-05-22 13:22:21 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-06-14 13:33:07 +0200 |
| commit | 2d4a31cc2e2b7b405baff620f727cc5398833a21 (patch) | |
| tree | 78e6f03052de32f12be97af6d2278d12cc762a1d /lib/crypto | |
| parent | ddc6b01876328be56326596b5be0f2b9d03285ae (diff) | |
| download | otp-2d4a31cc2e2b7b405baff620f727cc5398833a21.tar.gz otp-2d4a31cc2e2b7b405baff620f727cc5398833a21.tar.bz2 otp-2d4a31cc2e2b7b405baff620f727cc5398833a21.zip | |
crypto: Enable CMAC tests for aes-128-cbc and aes-256-cbc
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/test/crypto_SUITE.erl | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl index 56691223c4..dcbf5ea460 100644 --- a/lib/crypto/test/crypto_SUITE.erl +++ b/lib/crypto/test/crypto_SUITE.erl @@ -265,9 +265,9 @@ groups() -> %% New cipher nameing schema {des_ede3_cbc, [], [api_ng, api_ng_one_shot, api_ng_tls]}, {des_ede3_cfb, [], [api_ng, api_ng_one_shot, api_ng_tls]}, - {aes_128_cbc, [], [api_ng, api_ng_one_shot, api_ng_tls]}, + {aes_128_cbc, [], [api_ng, api_ng_one_shot, api_ng_tls, cmac]}, {aes_192_cbc, [], [api_ng, api_ng_one_shot, api_ng_tls]}, - {aes_256_cbc, [], [api_ng, api_ng_one_shot, api_ng_tls]}, + {aes_256_cbc, [], [api_ng, api_ng_one_shot, api_ng_tls, cmac]}, {aes_128_ctr, [], [api_ng, api_ng_one_shot, api_ng_tls]}, {aes_192_ctr, [], [api_ng, api_ng_one_shot, api_ng_tls]}, {aes_256_ctr, [], [api_ng, api_ng_one_shot, api_ng_tls]}, @@ -1836,13 +1836,12 @@ group_config(ecdh, Config) -> group_config(dh, Config) -> GenerateCompute = [dh()], [{generate_compute, GenerateCompute} | Config]; - -group_config(aes_cbc128 = Type, Config) -> - Block = fun() -> aes_cbc128(Config) end, +group_config(aes_128_cbc = Type, Config) -> + Block = fun() -> aes_128_cbc(Config) end, Pairs = fun() -> cmac_nist(Config, Type) end, [{cipher, Block}, {cmac, Pairs} | Config]; -group_config(aes_cbc256 = Type, Config) -> - Block = fun() -> aes_cbc256(Config) end, +group_config(aes_256_cbc = Type, Config) -> + Block = fun() -> aes_256_cbc(Config) end, Pairs = fun() -> cmac_nist(Config, Type) end, [{cipher, Block}, {cmac, Pairs} | Config]; group_config(chacha20_poly1305, Config) -> @@ -3843,11 +3842,11 @@ ecc() -> end, TestCases). -cmac_nist(Config, aes_cbc128 = Type) -> +cmac_nist(Config, aes_128_cbc = Type) -> read_rsp(Config, Type, ["CMACGenAES128.rsp", "CMACVerAES128.rsp"]); -cmac_nist(Config, aes_cbc256 = Type) -> +cmac_nist(Config, aes_256_cbc = Type) -> read_rsp(Config, Type, ["CMACGenAES256.rsp", "CMACVerAES256.rsp"]). |