diff options
| author | Jack Lloyd <jack.lloyd@ribose.com> | 2017-10-25 13:19:02 -0400 |
|---|---|---|
| committer | Ronald Tse <ronald.tse@ribose.com> | 2017-11-06 07:21:11 +0800 |
| commit | a0c3e4fa9089f571ff4b406cb914d0a504847b10 (patch) | |
| tree | 46bc0fccfcc317d2572145d3a13acf029523973d /util | |
| parent | cf72c7579201086cee303eadcb60bd28eff78dd9 (diff) | |
SM3: Add SM3 hash function
SM3 is a secure hash function which is part of the Chinese
"Commercial Cryptography" suite of algorithms which use is
required for certain commercial applications in China.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4616)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 5 | ||||
| -rwxr-xr-x | util/mkdef.pl | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index bbaa50bf1d..cf7575de5f 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4425,3 +4425,8 @@ EVP_sm4_cbc 4369 1_1_1 EXIST::FUNCTION:SM4 EVP_sm4_ofb 4370 1_1_1 EXIST::FUNCTION:SM4 EVP_sm4_ecb 4371 1_1_1 EXIST::FUNCTION:SM4 EVP_sm4_cfb128 4372 1_1_1 EXIST::FUNCTION:SM4 +EVP_sm3 4373 1_1_1 EXIST::FUNCTION:SM3 +SM3_Update 4374 1_1_1 EXIST::FUNCTION:SM3 +SM3 4375 1_1_1 EXIST::FUNCTION:SM3 +SM3_Init 4376 1_1_1 EXIST::FUNCTION:SM3 +SM3_Final 4377 1_1_1 EXIST::FUNCTION:SM3 diff --git a/util/mkdef.pl b/util/mkdef.pl index 1ca1112d04..20af2e8cd0 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -85,7 +85,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "EC2M", "HMAC", "AES", "CAMELLIA", "SEED", "GOST", "ARIA", "SM4", "SCRYPT", "CHACHA", "POLY1305", "BLAKE2", - "SIPHASH", + "SIPHASH", "SM3", # EC_NISTP_64_GCC_128 "EC_NISTP_64_GCC_128", # Envelope "algorithms" |