diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2023-01-04 12:44:06 +0200 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2023-01-04 12:52:09 +0200 |
| commit | d1ccc409d4c655f695c7dc042a629a8898bd14eb (patch) | |
| tree | e7573e07e6c2712875e48f2c1aca6aa7f652d6bc /tests | |
| parent | f2153d797f43a5fc8b80c2d908bf7dd6ad1fcc2a (diff) | |
| download | libgcrypt-d1ccc409d4c655f695c7dc042a629a8898bd14eb.tar.gz | |
Add GMAC-SM4 and Poly1305-SM4
* cipher/cipher.c (cipher_list_algo301): Remove comma at the end
of last entry.
* cipher/mac-gmac.c (map_mac_algo_to_cipher): Add SM4.
(_gcry_mac_type_spec_gmac_sm4): New.
* cipher/max-internal.h (_gcry_mac_type_spec_gmac_sm4)
(_gcry_mac_type_spec_poly1305mac_sm4): New.
* cipher/mac-poly1305.c (poly1305mac_open): Add SM4.
(_gcry_mac_type_spec_poly1305mac_sm4): New.
* cipher/mac.c (mac_list, mac_list_algo401, mac_list_algo501): Add
GMAC-SM4 and Poly1304-SM4.
(mac_list_algo101): Remove comma at the end of last entry.
* cipher/md.c (digest_list_algo301): Remove comma at the end of
last entry.
* doc/gcrypt.texi: Add GCRY_MAC_GMAC_SM4 and GCRY_MAC_POLY1305_SM4.
* src/gcrypt.h.in (GCRY_MAC_GMAC_SM4, GCRY_MAC_POLY1305_SM4): New.
* tests/bench-slope.c (bench_mac_init): Setup IV for
GCRY_MAC_POLY1305_SM4.
* tests/benchmark.c (mac_bench): Likewise.
--
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bench-slope.c | 1 | ||||
| -rw-r--r-- | tests/benchmark.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/bench-slope.c b/tests/bench-slope.c index 1cad6813..eb301569 100644 --- a/tests/bench-slope.c +++ b/tests/bench-slope.c @@ -2063,6 +2063,7 @@ bench_mac_init (struct bench_obj *obj) case GCRY_MAC_POLY1305_TWOFISH: case GCRY_MAC_POLY1305_SERPENT: case GCRY_MAC_POLY1305_SEED: + case GCRY_MAC_POLY1305_SM4: gcry_mac_setiv (hd, key, 16); break; } diff --git a/tests/benchmark.c b/tests/benchmark.c index e9223f5a..60abd2cb 100644 --- a/tests/benchmark.c +++ b/tests/benchmark.c @@ -652,7 +652,7 @@ mac_bench ( const char *algoname ) for (i=0; i < bufsize; i++) buf[i] = i; - if (algo >= GCRY_MAC_POLY1305_AES && algo <= GCRY_MAC_POLY1305_SEED) + if (algo >= GCRY_MAC_POLY1305_AES && algo <= GCRY_MAC_POLY1305_SM4) { static const char iv[16] = { 1, 2, 3, 4, }; err = gcry_mac_setiv(hd, iv, sizeof(iv)); |