Commit f19a5ff9 authored Oct 31, 2017 by Ronald Tse Committed by Pauli Oct 31, 2017

SM4: Add SM4 block cipher to EVP



Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4552)

parent ffd23209

CHANGES

+5 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,11 @@

		Changes between 1.1.0f and 1.1.1 [xx XXX xxxx]

		*) Add SM4 implemented according to GB/T 32907-2016.
		[ Jack Lloyd <jack.lloyd@ribose.com>,
		Ronald Tse <ronald.tse@ribose.com>,
		Erick Borsboom <erick.borsboom@ribose.com> ]

		*) Reimplement -newreq-nodes and ERR_error_string_n; the
		original author does not agree with the license change.
		[Rich Salz]

Configure

+2 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ $config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "util", "tools", "
		$config{sdirs} = [
		"objects",
		"md2", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305", "blake2", "siphash",
		"des", "aes", "rc2", "rc4", "rc5", "idea", "aria", "bf", "cast", "camellia", "seed", "chacha", "modes",
		"des", "aes", "rc2", "rc4", "rc5", "idea", "aria", "bf", "cast", "camellia", "seed", "sm4", "chacha", "modes",
		"bn", "ec", "rsa", "dsa", "dh", "dso", "engine",
		"buffer", "bio", "stack", "lhash", "rand", "err",
		"evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui",
		@@ -394,6 +394,7 @@ my @disablables = (
		"seed",
		"shared",
		"siphash",
		"sm4",
		"sock",
		"srp",
		"srtp",

INSTALL

+3 −3

Original line number	Diff line number	Diff line
		@@ -512,9 +512,9 @@
		Build without support for the specified algorithm, where
		<alg> is one of: bf, blake2, camellia, cast, chacha, cmac,
		des, dh, dsa, ecdh, ecdsa, idea, md4, mdc2, ocb, poly1305,
		rc2, rc4, rmd160, scrypt, seed, siphash or whirlpool. The
		"ripemd" algorithm is deprecated and if used is synonymous
		with rmd160.
		rc2, rc4, rmd160, scrypt, seed, siphash, sm4 or whirlpool.
		The "ripemd" algorithm is deprecated and if used is
		synonymous with rmd160.

		-Dxxx, lxxx, -Lxxx, -Wl, -rpath, -R, -framework, -static
		These system specific options will be recognised and

config

+1 −1

Original line number	Diff line number	Diff line
		@@ -848,7 +848,7 @@ case "$GUESSOS" in
		i386-*) options="$options 386" ;;
		esac

		for i in aes aria bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sha
		for i in aes aria bf camellia cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa seed sm4 sha
		do
		if [ ! -d $THERE/crypto/$i ]
		then

crypto/evp/build.info

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ LIBS=../../libcrypto
		SOURCE[../../libcrypto]=\
		encode.c digest.c evp_enc.c evp_key.c evp_cnf.c \
		e_des.c e_bf.c e_idea.c e_des3.c e_camellia.c\
		e_rc4.c e_aes.c names.c e_seed.c e_aria.c \
		e_rc4.c e_aes.c names.c e_seed.c e_aria.c e_sm4.c \
		e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \
		m_null.c m_md2.c m_md4.c m_md5.c m_sha1.c m_wp.c \
		m_md5_sha1.c m_mdc2.c m_ripemd.c m_sha3.c \
		@@ -19,5 +19,6 @@ INCLUDE[e_aes_cbc_hmac_sha1.o]=../modes
		INCLUDE[e_aes_cbc_hmac_sha256.o]=../modes
		INCLUDE[e_aria.o]=.. ../modes
		INCLUDE[e_camellia.o]=.. ../modes
		INCLUDE[e_sm4.o]=.. ../modes
		INCLUDE[e_des.o]=..
		INCLUDE[e_des3.o]=..