diff options
| author | Tianjia Zhang <tianjia.zhang@linux.alibaba.com> | 2020-06-16 17:09:28 +0800 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2020-06-16 21:44:37 +0300 |
| commit | ddcce166ab8bc6f51f5b509bcbea13a8746384ec (patch) | |
| tree | 31d7d8338be1c2399b4dddc78be6ef0fc90ceedc /configure.ac | |
| parent | 6c571bfda6409d7d668f5d44cea0c6c31e2688be (diff) | |
| download | libgcrypt-ddcce166ab8bc6f51f5b509bcbea13a8746384ec.tar.gz | |
Add SM4 symmetric cipher algorithm
* cipher/Makefile.am (EXTRA_libcipher_la_SOURCES): Add sm4.c.
* cipher/cipher.c (cipher_list, cipher_list_algo301): Add
_gcry_cipher_spec_sm4.
* cipher/mac-cmac.c (map_mac_algo_to_cipher): Add cmac SM4.
(_gcry_mac_type_spec_cmac_sm4): Add cmac SM4.
* cipher/mac-internal.h: Declare spec_cmac_sm4.
* cipher/mac.c (mac_list, mac_list_algo201): Add cmac SM4.
* cipher/sm4.c: New.
* configure.ac (available_ciphers): Add sm4.
* doc/gcrypt.texi: Add SM4 document.
* src/cipher.h: Add declarations for SM4 and cmac SM4.
* src/gcrypt.h.in (gcry_cipher_algos): Add algorithm ID for SM4.
--
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
[jk: add missing mapping in mac-cmac.c:map_mac_algo_to_cipher]
[jk: add GCRY_MAC_CMAC_SM4 to gcrypt.texi]
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 0c9100bf..f77476e0 100644 --- a/configure.ac +++ b/configure.ac @@ -212,6 +212,7 @@ LIBGCRYPT_CONFIG_HOST="$host" # Definitions for symmetric ciphers. available_ciphers="arcfour blowfish cast5 des aes twofish serpent rfc2268 seed" available_ciphers="$available_ciphers camellia idea salsa20 gost28147 chacha20" +available_ciphers="$available_ciphers sm4" enabled_ciphers="" # Definitions for public-key ciphers. @@ -2559,6 +2560,12 @@ if test "$found" = "1" ; then fi fi +LIST_MEMBER(sm4, $enabled_ciphers) +if test "$found" = "1" ; then + GCRYPT_CIPHERS="$GCRYPT_CIPHERS sm4.lo" + AC_DEFINE(USE_SM4, 1, [Defined if this module should be included]) +fi + LIST_MEMBER(dsa, $enabled_pubkey_ciphers) if test "$found" = "1" ; then GCRYPT_PUBKEY_CIPHERS="$GCRYPT_PUBKEY_CIPHERS dsa.lo" |