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 | |
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>
-rw-r--r-- | cipher/Makefile.am | 1 | ||||
-rw-r--r-- | cipher/cipher.c | 8 | ||||
-rw-r--r-- | cipher/mac-cmac.c | 8 | ||||
-rw-r--r-- | cipher/mac-internal.h | 3 | ||||
-rw-r--r-- | cipher/mac.c | 10 | ||||
-rw-r--r-- | cipher/sm4.c | 275 | ||||
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | doc/gcrypt.texi | 10 | ||||
-rw-r--r-- | src/cipher.h | 1 | ||||
-rw-r--r-- | src/gcrypt.h.in | 4 |
10 files changed, 325 insertions, 2 deletions
diff --git a/cipher/Makefile.am b/cipher/Makefile.am index ef83cc74..56661dcd 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -107,6 +107,7 @@ EXTRA_libcipher_la_SOURCES = \ scrypt.c \ seed.c \ serpent.c serpent-sse2-amd64.S \ + sm4.c \ serpent-avx2-amd64.S serpent-armv7-neon.S \ sha1.c sha1-ssse3-amd64.S sha1-avx-amd64.S sha1-avx-bmi2-amd64.S \ sha1-avx2-bmi2-amd64.S sha1-armv7-neon.S sha1-armv8-aarch32-ce.S \ diff --git a/cipher/cipher.c b/cipher/cipher.c index edcb421a..dfb083a0 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -88,6 +88,9 @@ static gcry_cipher_spec_t * const cipher_list[] = #if USE_CHACHA20 &_gcry_cipher_spec_chacha20, #endif +#if USE_SM4 + &_gcry_cipher_spec_sm4, +#endif NULL }; @@ -203,6 +206,11 @@ static gcry_cipher_spec_t * const cipher_list_algo301[] = #else NULL, #endif +#if USE_SM4 + &_gcry_cipher_spec_sm4, +#else + NULL, +#endif }; diff --git a/cipher/mac-cmac.c b/cipher/mac-cmac.c index aee5bb63..120fa3df 100644 --- a/cipher/mac-cmac.c +++ b/cipher/mac-cmac.c @@ -57,6 +57,8 @@ map_mac_algo_to_cipher (int mac_algo) return GCRY_CIPHER_RFC2268_128; case GCRY_MAC_CMAC_GOST28147: return GCRY_CIPHER_GOST28147; + case GCRY_MAC_CMAC_SM4: + return GCRY_CIPHER_SM4; } } @@ -225,3 +227,9 @@ gcry_mac_spec_t _gcry_mac_type_spec_cmac_gost28147 = { &cmac_ops }; #endif +#if USE_SM4 +gcry_mac_spec_t _gcry_mac_type_spec_cmac_sm4 = { + GCRY_MAC_CMAC_SM4, {0, 0}, "CMAC_SM4", + &cmac_ops +}; +#endif diff --git a/cipher/mac-internal.h b/cipher/mac-internal.h index 1936150c..8c13520b 100644 --- a/cipher/mac-internal.h +++ b/cipher/mac-internal.h @@ -229,6 +229,9 @@ extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_gost28147; #if USE_GOST28147 extern gcry_mac_spec_t _gcry_mac_type_spec_gost28147_imit; #endif +#if USE_SM4 +extern gcry_mac_spec_t _gcry_mac_type_spec_cmac_sm4; +#endif /* * The GMAC algorithm specifications (mac-gmac.c). diff --git a/cipher/mac.c b/cipher/mac.c index 0abc0d33..933be74c 100644 --- a/cipher/mac.c +++ b/cipher/mac.c @@ -130,6 +130,9 @@ static gcry_mac_spec_t * const mac_list[] = { &_gcry_mac_type_spec_gost28147_imit, #endif &_gcry_mac_type_spec_poly1305mac, +#if USE_SM4 + &_gcry_mac_type_spec_cmac_sm4, +#endif NULL, }; @@ -300,7 +303,12 @@ static gcry_mac_spec_t * const mac_list_algo201[] = NULL, #endif #if USE_GOST28147 - &_gcry_mac_type_spec_cmac_gost28147 + &_gcry_mac_type_spec_cmac_gost28147, +#else + NULL, +#endif +#if USE_SM4 + &_gcry_mac_type_spec_cmac_sm4 #else NULL #endif diff --git a/cipher/sm4.c b/cipher/sm4.c new file mode 100644 index 00000000..061ee26e --- /dev/null +++ b/cipher/sm4.c @@ -0,0 +1,275 @@ +/* sm4.c - SM4 Cipher Algorithm + * Copyright (C) 2020 Alibaba Group. + * Copyright (C) 2020 Tianjia Zhang <tianjia.zhang@linux.alibaba.com> + * + * This file is part of Libgcrypt. + * + * Libgcrypt is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * Libgcrypt is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#include <config.h> +#include <stdio.h> +#include <stdlib.h> + +#include "types.h" /* for byte and u32 typedefs */ +#include "bithelp.h" +#include "g10lib.h" +#include "cipher.h" +#include "bufhelp.h" + +typedef struct +{ + u32 rkey_enc[32]; + u32 rkey_dec[32]; +} SM4_context; + +static const u32 fk[4] = { + 0xa3b1bac6, 0x56aa3350, 0x677d9197, 0xb27022dc +}; + +static const byte sbox[256] = { + 0xd6, 0x90, 0xe9, 0xfe, 0xcc, 0xe1, 0x3d, 0xb7, + 0x16, 0xb6, 0x14, 0xc2, 0x28, 0xfb, 0x2c, 0x05, + 0x2b, 0x67, 0x9a, 0x76, 0x2a, 0xbe, 0x04, 0xc3, + 0xaa, 0x44, 0x13, 0x26, 0x49, 0x86, 0x06, 0x99, + 0x9c, 0x42, 0x50, 0xf4, 0x91, 0xef, 0x98, 0x7a, + 0x33, 0x54, 0x0b, 0x43, 0xed, 0xcf, 0xac, 0x62, + 0xe4, 0xb3, 0x1c, 0xa9, 0xc9, 0x08, 0xe8, 0x95, + 0x80, 0xdf, 0x94, 0xfa, 0x75, 0x8f, 0x3f, 0xa6, + 0x47, 0x07, 0xa7, 0xfc, 0xf3, 0x73, 0x17, 0xba, + 0x83, 0x59, 0x3c, 0x19, 0xe6, 0x85, 0x4f, 0xa8, + 0x68, 0x6b, 0x81, 0xb2, 0x71, 0x64, 0xda, 0x8b, + 0xf8, 0xeb, 0x0f, 0x4b, 0x70, 0x56, 0x9d, 0x35, + 0x1e, 0x24, 0x0e, 0x5e, 0x63, 0x58, 0xd1, 0xa2, + 0x25, 0x22, 0x7c, 0x3b, 0x01, 0x21, 0x78, 0x87, + 0xd4, 0x00, 0x46, 0x57, 0x9f, 0xd3, 0x27, 0x52, + 0x4c, 0x36, 0x02, 0xe7, 0xa0, 0xc4, 0xc8, 0x9e, + 0xea, 0xbf, 0x8a, 0xd2, 0x40, 0xc7, 0x38, 0xb5, + 0xa3, 0xf7, 0xf2, 0xce, 0xf9, 0x61, 0x15, 0xa1, + 0xe0, 0xae, 0x5d, 0xa4, 0x9b, 0x34, 0x1a, 0x55, + 0xad, 0x93, 0x32, 0x30, 0xf5, 0x8c, 0xb1, 0xe3, + 0x1d, 0xf6, 0xe2, 0x2e, 0x82, 0x66, 0xca, 0x60, + 0xc0, 0x29, 0x23, 0xab, 0x0d, 0x53, 0x4e, 0x6f, + 0xd5, 0xdb, 0x37, 0x45, 0xde, 0xfd, 0x8e, 0x2f, + 0x03, 0xff, 0x6a, 0x72, 0x6d, 0x6c, 0x5b, 0x51, + 0x8d, 0x1b, 0xaf, 0x92, 0xbb, 0xdd, 0xbc, 0x7f, + 0x11, 0xd9, 0x5c, 0x41, 0x1f, 0x10, 0x5a, 0xd8, + 0x0a, 0xc1, 0x31, 0x88, 0xa5, 0xcd, 0x7b, 0xbd, + 0x2d, 0x74, 0xd0, 0x12, 0xb8, 0xe5, 0xb4, 0xb0, + 0x89, 0x69, 0x97, 0x4a, 0x0c, 0x96, 0x77, 0x7e, + 0x65, 0xb9, 0xf1, 0x09, 0xc5, 0x6e, 0xc6, 0x84, + 0x18, 0xf0, 0x7d, 0xec, 0x3a, 0xdc, 0x4d, 0x20, + 0x79, 0xee, 0x5f, 0x3e, 0xd7, 0xcb, 0x39, 0x48 +}; + +static const u32 ck[] = { + 0x00070e15, 0x1c232a31, 0x383f464d, 0x545b6269, + 0x70777e85, 0x8c939aa1, 0xa8afb6bd, 0xc4cbd2d9, + 0xe0e7eef5, 0xfc030a11, 0x181f262d, 0x343b4249, + 0x50575e65, 0x6c737a81, 0x888f969d, 0xa4abb2b9, + 0xc0c7ced5, 0xdce3eaf1, 0xf8ff060d, 0x141b2229, + 0x30373e45, 0x4c535a61, 0x686f767d, 0x848b9299, + 0xa0a7aeb5, 0xbcc3cad1, 0xd8dfe6ed, 0xf4fb0209, + 0x10171e25, 0x2c333a41, 0x484f565d, 0x646b7279 +}; + +static u32 sm4_t_non_lin_sub(u32 x) +{ + int i; + byte *b = (byte *)&x; + + for (i = 0; i < 4; ++i) + b[i] = sbox[b[i]]; + + return x; +} + +static u32 sm4_key_lin_sub(u32 x) +{ + return x ^ rol(x, 13) ^ rol(x, 23); +} + +static u32 sm4_enc_lin_sub(u32 x) +{ + return x ^ rol(x, 2) ^ rol(x, 10) ^ rol(x, 18) ^ rol(x, 24); +} + +static u32 sm4_key_sub(u32 x) +{ + return sm4_key_lin_sub(sm4_t_non_lin_sub(x)); +} + +static u32 sm4_enc_sub(u32 x) +{ + return sm4_enc_lin_sub(sm4_t_non_lin_sub(x)); +} + +static u32 sm4_round(const u32 *x, const u32 rk) +{ + return x[0] ^ sm4_enc_sub(x[1] ^ x[2] ^ x[3] ^ rk); +} + +static gcry_err_code_t +sm4_expand_key (SM4_context *ctx, const byte *key, const unsigned keylen) +{ + u32 rk[4], t; + int i; + + if (keylen != 16) + return GPG_ERR_INV_KEYLEN; + + for (i = 0; i < 4; ++i) + rk[i] = buf_get_be32(&key[i*4]) ^ fk[i]; + + for (i = 0; i < 32; ++i) + { + t = rk[0] ^ sm4_key_sub(rk[1] ^ rk[2] ^ rk[3] ^ ck[i]); + ctx->rkey_enc[i] = t; + rk[0] = rk[1]; + rk[1] = rk[2]; + rk[2] = rk[3]; + rk[3] = t; + } + + for (i = 0; i < 32; ++i) + ctx->rkey_dec[i] = ctx->rkey_enc[31 - i]; + + return 0; +} + +static gcry_err_code_t +sm4_setkey (void *context, const byte *key, const unsigned keylen, + gcry_cipher_hd_t hd) +{ + SM4_context *ctx = context; + int rc = sm4_expand_key (ctx, key, keylen); + (void)hd; + _gcry_burn_stack (4*5 + sizeof(int)*2); + return rc; +} + +static void +sm4_do_crypt (const u32 *rk, byte *out, const byte *in) +{ + u32 x[4], t; + int i; + + for (i = 0; i < 4; ++i) + x[i] = buf_get_be32(&in[i*4]); + + for (i = 0; i < 32; ++i) + { + t = sm4_round(x, rk[i]); + x[0] = x[1]; + x[1] = x[2]; + x[2] = x[3]; + x[3] = t; + } + + for (i = 0; i < 4; ++i) + buf_put_be32(&out[i*4], x[3 - i]); +} + +static unsigned int +sm4_encrypt (void *context, byte *outbuf, const byte *inbuf) +{ + SM4_context *ctx = context; + + sm4_do_crypt (ctx->rkey_enc, outbuf, inbuf); + return /*burn_stack*/ 4*6+sizeof(void*)*4; +} + +static unsigned int +sm4_decrypt (void *context, byte *outbuf, const byte *inbuf) +{ + SM4_context *ctx = context; + + sm4_do_crypt (ctx->rkey_dec, outbuf, inbuf); + return /*burn_stack*/ 4*6+sizeof(void*)*4; +} + +static const char * +sm4_selftest (void) +{ + SM4_context ctx; + byte scratch[16]; + + static const byte plaintext[16] = { + 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, + 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10, + }; + static const byte key[16] = { + 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, + 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10, + }; + static const byte ciphertext[16] = { + 0x68, 0x1E, 0xDF, 0x34, 0xD2, 0x06, 0x96, 0x5E, + 0x86, 0xB3, 0xE9, 0x4F, 0x53, 0x6E, 0x42, 0x46 + }; + + sm4_setkey (&ctx, key, sizeof (key), NULL); + sm4_encrypt (&ctx, scratch, plaintext); + if (memcmp (scratch, ciphertext, sizeof (ciphertext))) + return "SM4 test encryption failed."; + sm4_decrypt (&ctx, scratch, scratch); + if (memcmp (scratch, plaintext, sizeof (plaintext))) + return "SM4 test decryption failed."; + + return NULL; +} + +static gpg_err_code_t +run_selftests (int algo, int extended, selftest_report_func_t report) +{ + const char *what; + const char *errtxt; + + (void)extended; + + if (algo != GCRY_CIPHER_SM4) + return GPG_ERR_CIPHER_ALGO; + + what = "selftest"; + errtxt = sm4_selftest (); + if (errtxt) + goto failed; + + return 0; + + failed: + if (report) + report ("cipher", GCRY_CIPHER_SM4, what, errtxt); + return GPG_ERR_SELFTEST_FAILED; +} + + +static gcry_cipher_oid_spec_t sm4_oids[] = + { + { "1.2.156.10197.1.104.1", GCRY_CIPHER_MODE_ECB }, + { "1.2.156.10197.1.104.2", GCRY_CIPHER_MODE_CBC }, + { "1.2.156.10197.1.104.3", GCRY_CIPHER_MODE_OFB }, + { "1.2.156.10197.1.104.4", GCRY_CIPHER_MODE_CFB }, + { "1.2.156.10197.1.104.7", GCRY_CIPHER_MODE_CTR }, + { NULL } + }; + +gcry_cipher_spec_t _gcry_cipher_spec_sm4 = + { + GCRY_CIPHER_SM4, {0, 0}, + "SM4", NULL, sm4_oids, 16, 128, + sizeof (SM4_context), + sm4_setkey, sm4_encrypt, sm4_decrypt, + NULL, NULL, + run_selftests + }; 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" diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi index 4eaf6d8d..73ed4006 100644 --- a/doc/gcrypt.texi +++ b/doc/gcrypt.texi @@ -1641,6 +1641,12 @@ if it has to be used for the selected parameter set. @cindex ChaCha20 This is the ChaCha20 stream cipher. +@item GCRY_CIPHER_SM4 +@cindex SM4 (cipher) +A 128 bit cipher by the State Cryptography Administration +of China (SCA). See +@uref{https://tools.ietf.org/html/draft-ribose-cfrg-sm4-10}. + @end table @node Available cipher modes @@ -3869,6 +3875,10 @@ block cipher algorithm. This is CMAC message authentication algorithm based on the GOST 28147-89 block cipher algorithm. +@item GCRY_MAC_CMAC_SM4 +This is CMAC message authentication algorithm based on the SM4 +block cipher algorithm. + @item GCRY_MAC_GMAC_AES This is GMAC (GCM mode based MAC) message authentication algorithm based on the AES block cipher algorithm. diff --git a/src/cipher.h b/src/cipher.h index 20ccb8c5..c49bbda5 100644 --- a/src/cipher.h +++ b/src/cipher.h @@ -302,6 +302,7 @@ extern gcry_cipher_spec_t _gcry_cipher_spec_salsa20r12; extern gcry_cipher_spec_t _gcry_cipher_spec_gost28147; extern gcry_cipher_spec_t _gcry_cipher_spec_gost28147_mesh; extern gcry_cipher_spec_t _gcry_cipher_spec_chacha20; +extern gcry_cipher_spec_t _gcry_cipher_spec_sm4; /* Declarations for the digest specifications. */ extern gcry_md_spec_t _gcry_digest_spec_crc32; diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in index c0132189..5668e625 100644 --- a/src/gcrypt.h.in +++ b/src/gcrypt.h.in @@ -946,7 +946,8 @@ enum gcry_cipher_algos GCRY_CIPHER_SALSA20R12 = 314, GCRY_CIPHER_GOST28147 = 315, GCRY_CIPHER_CHACHA20 = 316, - GCRY_CIPHER_GOST28147_MESH = 317 /* GOST 28247 with optional CryptoPro keymeshing */ + GCRY_CIPHER_GOST28147_MESH = 317, /* GOST 28247 with optional CryptoPro keymeshing */ + GCRY_CIPHER_SM4 = 318 }; /* The Rijndael algorithm is basically AES, so provide some macros. */ @@ -1484,6 +1485,7 @@ enum gcry_mac_algos GCRY_MAC_CMAC_RFC2268 = 209, GCRY_MAC_CMAC_IDEA = 210, GCRY_MAC_CMAC_GOST28147 = 211, + GCRY_MAC_CMAC_SM4 = 212, GCRY_MAC_GMAC_AES = 401, GCRY_MAC_GMAC_CAMELLIA = 402, |