new modules

util/mk1mf.pl

@@ -111,7 +111,7 @@ and [options] can be one of
 	no-ripemd no-sm3
 	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-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
@@ -295,6 +295,7 @@ $cflags.= " -DZLIB" if $zlib_opt;
 $cflags.= " -DZLIB_SHARED" if $zlib_opt == 2;
 $cflags.=" -DOPENSSL_NO_SM3"  if $no_sm3;
 $cflags.=" -DOPENSSL_NO_SMS4" if $no_sms4;
+$cflags.=" -DOPENSSL_NO_ZUC" if $no_zuc;
 
 if ($no_static_engine)
 	{
@@ -919,6 +920,7 @@ sub var_add
 
 	@a=grep(!/(^sm3)|(_sm3$)/,@a) if $no_sm3;
 	@a=grep(!/(^sms4)|(_sms4$)/,@a) if $no_sms4;
+	@a=grep(!/(^zuc)|(_zuc$)/,@a) if $no_zuc;
 
 	grep($_="$dir/$_",@a);
 	@a=grep(!/(^|\/)s_/,@a) if $no_sock;
@@ -1248,7 +1250,8 @@ sub read_options
 		"no-multiblock" => 0,
 		"fips" => \$fips,
 		"no-sm3" => \$no_sm3,
-		"no-sms4" => \$no_sms4
+		"no-sms4" => \$no_sms4,
+		"no-zuc" => \$no_zuc
 		);
 
 	if (exists $valid_options{$_})

util/mkdef.pl

@@ -146,7 +146,7 @@ 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_sm3; my $no_sms4; my $no_zuc;
 
 my $fips;
 
@@ -251,6 +251,7 @@ foreach (@ARGV, split(/ /, $options))
 	elsif (/^no-unit-test$/){ $no_unit_test=1; }
 	elsif (/^no-sm3$/)	{ $no_sm3=1; }
 	elsif (/^no-sms4$/)	{ $no_sms4=1; }
+	elsif (/^no-zuc$/)	{ $no_zuc=1; }
 	}
 
 
@@ -361,6 +362,7 @@ $crypto.=" crypto/srp/srp.h";
 
 $crypto.=" crypto/sm3/sm3.h" ; # unless $no_sm3;
 $crypto.=" crypto/sms4/sms4.h" ; # unless $no_sms4;
+$crypto.=" crypto/zuc/zuc.h" ; # unless $no_zuc;
 
 my $symhacks="crypto/symhacks.h";
 
@@ -983,6 +985,7 @@ sub do_defs
 			$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);
@@ -1236,6 +1239,7 @@ sub is_valid
 			if ($keyword eq "DEPRECATED" && $no_deprecated) { 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; }
 
 			# Nothing recognise as true
 			return 1;

util/mkfiles.pl

@@ -23,6 +23,7 @@ my @dirs = (
 "crypto/rc4",
 "crypto/rc5",
 "crypto/sms4",
+"crypto/zuc",
 "crypto/idea",
 "crypto/bf",
 "crypto/cast",

util/sp-diff.pl

@@ -13,7 +13,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")
+	"sm3","sms4 cfb","sms4 cbc","zuc")
 	{
 	if (defined($one{$a,8}) && defined($two{$a,8}))
 		{