Bug fix

Thanks to github.com/Jkinglyf

util/libeay.num

@@ -4414,20 +4414,3 @@ X509_VERIFY_PARAM_add1_host             4771	EXIST::FUNCTION:
 EC_GROUP_get_mont_data                  4772	EXIST::FUNCTION:EC
 i2d_re_X509_tbs                         4773	EXIST::FUNCTION:
 EVP_PKEY_asn1_set_item                  4774	EXIST::FUNCTION:
-sm3_update                              4775	EXIST::FUNCTION:
-sm3_compress                            4776	EXIST::FUNCTION:
-sm3_final                               4777	EXIST::FUNCTION:
-sm3                                     4778	EXIST::FUNCTION:
-sm3_init                                4779	EXIST::FUNCTION:
-EVP_sm3                                 4780	EXIST::FUNCTION:SM3
-sms4_cbc_encrypt                        4781	EXIST::FUNCTION:
-EVP_sms4_ofb                            4782	EXIST::FUNCTION:SMS4
-sms4_ofb128_encrypt                     4783	EXIST::FUNCTION:
-EVP_sms4_ecb                            4784	EXIST::FUNCTION:SMS4
-EVP_sms4_cfb128                         4785	EXIST::FUNCTION:SMS4
-sms4_set_encrypt_key                    4786	EXIST::FUNCTION:
-sms4_encrypt                            4787	EXIST::FUNCTION:
-EVP_sms4_cbc                            4788	EXIST::FUNCTION:SMS4
-sms4_ecb_encrypt                        4789	EXIST::FUNCTION:
-sms4_cfb128_encrypt                     4790	EXIST::FUNCTION:
-sms4_set_decrypt_key                    4791	EXIST::FUNCTION:

util/mk1mf.pl

@@ -108,10 +108,9 @@ foreach (@ARGV)
 		print STDERR <<"EOF";
 and [options] can be one of
 	no-md2 no-md4 no-md5 no-sha no-mdc2	- Skip this digest
-	no-ripemd no-sm3
+	no-ripemd
 	no-rc2 no-rc4 no-rc5 no-idea no-des     - Skip this symetric cipher
 	no-bf no-cast no-aes no-camellia no-seed
-	no-sms4 no-zuc
 	no-rsa no-dsa no-dh			- Skip this public key cipher
 	no-ssl2 no-ssl3				- Skip this version of SSL
 	just-ssl				- remove all non-ssl keys/digest
@@ -121,9 +120,6 @@ and [options] can be one of
 	no-ec					- No EC
 	no-ecdsa				- No ECDSA
 	no-ecdh					- No ECDH
-	no-ecies				- No ECIES
-	no-sm2					- No SM2
-	no-cpk					- No CPK
 	no-engine				- No engine
 	no-hw					- No hw
 	nasm 					- Use NASM for x86 asm
@@ -296,12 +292,6 @@ $cflags.=" -DOPENSSL_NO_JPAKE"    if $no_jpake;
 $cflags.=" -DOPENSSL_NO_EC2M"    if $no_ec2m;
 $cflags.= " -DZLIB" if $zlib_opt;
 $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
-$cflags.=" -DOPENSSL_NO_SM2"  if $no_sm2;
-$cflags.=" -DOPENSSL_NO_SM3"  if $no_sm3;
-$cflags.=" -DOPENSSL_NO_SMS4" if $no_sms4;
-$cflags.=" -DOPENSSL_NO_ZUC" if $no_zuc;
-$cflags.=" -DOPENSSL_NO_ECIES" if $no_ecies;
-$cflags.=" -DOPENSSL_NO_CPK" if $no_cpk;
 
 if ($no_static_engine)
 	{
@@ -924,13 +914,6 @@ sub var_add
 
 	@a=grep(!/(^dh)|(_sha1$)|(m_dss1$)/,@a) if $no_sha1;
 
-	@a=grep(!/(^sm2)|(_sm2$)/,@a) if $no_sm2;
-	@a=grep(!/(^sm3)|(_sm3$)/,@a) if $no_sm3;
-	@a=grep(!/(^sms4)|(_sms4$)/,@a) if $no_sms4;
-	@a=grep(!/(^zuc)|(_zuc$)/,@a) if $no_zuc;
-	@a=grep(!/(^ecies)|(_ecies$)/,@a) if $no_ecies;
-	@a=grep(!/(^cpk)|(_cpk$)/,@a) if $no_cpk;
-
 	grep($_="$dir/$_",@a);
 	@a=grep(!/(^|\/)s_/,@a) if $no_sock;
 	@a=grep(!/(^|\/)bio_sock/,@a) if $no_sock;
@@ -1257,13 +1240,7 @@ sub read_options
 		"no-unit-test" => 0,
 		"no-libunbound" => 0,
 		"no-multiblock" => 0,
-		"fips" => \$fips,
-		"no-sm2" => \$no_sm2,
-		"no-sm3" => \$no_sm3,
-		"no-sms4" => \$no_sms4,
-		"no-zuc" => \$no_zuc
-		"no-ecies" => \$no_ecies
-		"no-cpk" => \$no_cpk
+		"fips" => \$fips
 		);
 
 	if (exists $valid_options{$_})

util/mkdef.pl

@@ -83,8 +83,8 @@ my @known_platforms = ( "__FreeBSD__", "PERL5", "NeXT",
 my @known_ossl_platforms = ( "VMS", "WIN16", "WIN32", "WINNT", "OS2" );
 my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
 			 "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1",
-			 "SHA256", "SHA512", "RIPEMD", "SM3", "SMS4",
-			 "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M", "ECIES",
+			 "SHA256", "SHA512", "RIPEMD",
+			 "MDC2", "WHIRLPOOL", "RSA", "DSA", "DH", "EC", "ECDH", "ECDSA", "EC2M",
 			 "HMAC", "AES", "CAMELLIA", "SEED", "GOST",
 			 # EC_NISTP_64_GCC_128
 			 "EC_NISTP_64_GCC_128",
@@ -146,7 +146,6 @@ my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng;
 my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc; 
 my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace;
 my $no_unit_test; my $no_ssl3_method;
-my $no_sm3; my $no_sms4; my $no_zuc; my $no_ecies; my $no_cpk; my $no_sm2;
 
 my $fips;
 
@@ -249,12 +248,6 @@ foreach (@ARGV, split(/ /, $options))
 	elsif (/^no-sctp$/)	{ $no_sctp=1; }
 	elsif (/^no-srtp$/)	{ $no_srtp=1; }
 	elsif (/^no-unit-test$/){ $no_unit_test=1; }
-	elsif (/^no-sm2$/)	{ $no_sm2=1; }
-	elsif (/^no-sm3$/)	{ $no_sm3=1; }
-	elsif (/^no-sms4$/)	{ $no_sms4=1; }
-	elsif (/^no-zuc$/)	{ $no_zuc=1; }
-	elsif (/^no-ecies$/)	{ $no_ecies=1; }
-	elsif (/^no-cpk$/)	{ $no_cpk=1; }
 	}
 
 
@@ -361,14 +354,6 @@ $crypto.=" crypto/jpake/jpake.h";
 $crypto.=" crypto/modes/modes.h";
 $crypto.=" crypto/srp/srp.h";
 
-$crypto.=" crypto/sm2/sm2.h"; # unless $no_sm2;
-$crypto.=" crypto/sm3/sm3.h"; # unless $no_sm3;
-$crypto.=" crypto/sms4/sms4.h"; # unless $no_sms4;
-$crypto.=" crypto/zuc/zuc.h"; # unless $no_zuc;
-$crypto.=" crypto/ecies/ecies.h";
-$crypto.=" crypto/ecies/kdf.h";
-$crypto.=" crypto/ecies/cpk.h";
-
 my $symhacks="crypto/symhacks.h";
 
 my @ssl_symbols = &do_defs("SSLEAY", $ssl, $symhacks);
@@ -988,9 +973,6 @@ sub do_defs
 			$a .= ",RSA" if($s =~ /PEM_Seal(Final|Init|Update)/);
 			$a .= ",RSA" if($s =~ /RSAPrivateKey/);
 			$a .= ",RSA" if($s =~ /SSLv23?_((client|server)_)?method/);
-			$a .= ",SM3" if($s =~ /EVP_sm3/);
-			$a .= ",SMS4" if($s =~ /EVP_sms4/);
-			$a .= ",ZUC" if($s =~ /EVP_zuc/);
 
 			$platform{$s} =
 			    &reduce_platforms((defined($platform{$s})?$platform{$s}.',':"").$p);
@@ -1242,12 +1224,6 @@ sub is_valid
 			if ($keyword eq "SRTP" && $no_srtp) { return 0; }
 			if ($keyword eq "UNIT_TEST" && $no_unit_test) { return 0; }
 			if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; }
-			if ($keyword eq "SM2" && $no_sm2) { return 0; }
-			if ($keyword eq "SM3" && $no_sm3) { return 0; }
-			if ($keyword eq "SMS4" && $no_sms4) { return 0; }
-			if ($keyword eq "ZUC" && $no_zuc) { return 0; }
-			if ($keyword eq "ECIES" && $no_ecies) { return 0; }
-			if ($keyword eq "CPK" && $no_cpk) { return 0; }
 
 			# Nothing recognise as true
 			return 1;

util/mkfiles.pl

@@ -64,12 +64,20 @@ my @dirs = (
 "crypto/whrlpool",
 "crypto/ts",
 "crypto/srp",
+"crypto/sm1",
+"crypto/sm2",
 "crypto/sm3",
 "crypto/sms4",
-"crypto/zuc",
+"crypto/ssf33",
+"crypto/kdf",
 "crypto/ecies",
 "crypto/cpk",
-"crypto/sm2",
+"crypto/skf",
+"crypto/cbcmac",
+"crypto/otp",
+"crypto/sm9",
+"crypto/paillier",
+"crypto/ffx",
 "ssl",
 "apps",
 "engines",

util/sp-diff.pl

@@ -12,8 +12,7 @@
 
 $line=0;
 foreach $a ("md2","md4","md5","sha","sha1","rc4","des cfb","des cbc","des ede3",
-	"idea cfb","idea cbc","rc2 cfb","rc2 cbc","blowfish cbc","cast cbc",
-	"sm3","sms4 cfb","sms4 cbc","zuc")
+	"idea cfb","idea cbc","rc2 cfb","rc2 cbc","blowfish cbc","cast cbc")
 	{
 	if (defined($one{$a,8}) && defined($two{$a,8}))
 		{