abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-09-23 22:03:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Zhi Guan
2015-10-11 11:56:45 +08:00
parent b4ad0da508
commit 3f21c9d3d0
33 changed files with 739 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/mk1mf.pl
View File

@@ -122,6 +122,7 @@ and [options] can be one of
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
@@ -295,6 +296,7 @@ $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;
@@ -922,6 +924,7 @@ 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;
@@ -1255,6 +1258,7 @@ sub read_options
"no-libunbound" => 0,
"no-multiblock" => 0,
"fips" => \$fips,
"no-sm2" => \$no_sm2,
"no-sm3" => \$no_sm3,
"no-sms4" => \$no_sms4,
"no-zuc" => \$no_zuc

5
util/mkdef.pl
View File

@@ -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_zuc; my $no_ecies; my $no_cpk;
my $no_sm3; my $no_sms4; my $no_zuc; my $no_ecies; my $no_cpk; my $no_sm2;
my $fips;
@@ -249,6 +249,7 @@ 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; }
@@ -360,6 +361,7 @@ $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;
@@ -1240,6 +1242,7 @@ 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; }

11
util/mkfiles.pl
View File

@@ -17,13 +17,10 @@ my @dirs = (
"crypto/hmac",
"crypto/cmac",
"crypto/ripemd",
"crypto/sm3",
"crypto/des",
"crypto/rc2",
"crypto/rc4",
"crypto/rc5",
"crypto/sms4",
"crypto/zuc",
"crypto/idea",
"crypto/bf",
"crypto/cast",
@@ -39,8 +36,6 @@ my @dirs = (
"crypto/ec",
"crypto/ecdh",
"crypto/ecdsa",
"crypto/ecies",
"crypto/cpk",
"crypto/buffer",
"crypto/bio",
"crypto/stack",
@@ -69,6 +64,12 @@ my @dirs = (
"crypto/whrlpool",
"crypto/ts",
"crypto/srp",
"crypto/sm3",
"crypto/sms4",
"crypto/zuc",
"crypto/ecies",
"crypto/cpk",
"crypto/sm2",
"ssl",
"apps",
"engines",