abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-08-07 21:53:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

change command line name and version

Browse Source
This commit is contained in:
Zhi Guan
2017-02-14 16:37:54 +08:00
parent 6125eb92b3
commit 9c1bdbdf72
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Configurations/unix-Makefile.tmpl
View File

@@ -676,7 +676,7 @@ lint:
{- # because the program apps/openssl has object files as sources, and {- # because the program apps/openssl has object files as sources, and
# they then have the corresponding C files as source, we need to chain # they then have the corresponding C files as source, we need to chain
# the lookups in %unified_info # the lookups in %unified_info
my $apps_openssl = catfile("apps","openssl"); my $apps_openssl = catfile("apps","gmssl");
our @openssl_source = map { @{$unified_info{sources}->{$_}} } our @openssl_source = map { @{$unified_info{sources}->{$_}} }
@{$unified_info{sources}->{$apps_openssl}}; @{$unified_info{sources}->{$apps_openssl}};
""; -} ""; -}

10
apps/build.info
View File

@@ -1,9 +1,9 @@
{- our $tsget_name = $config{target} =~ /^(VC|vms)-/ ? "tsget.pl" : "tsget"; {- our $tsget_name = $config{target} =~ /^(VC|vms)-/ ? "tsget.pl" : "tsget";
"" -} "" -}
IF[{- !$disabled{apps} -}] IF[{- !$disabled{apps} -}]
PROGRAMS=openssl PROGRAMS=gmssl
SOURCE[openssl]=\ SOURCE[gmssl]=\
openssl.c \ gmssl.c \
asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c \ asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c \
dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c \ dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c \
genpkey.c genrsa.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c pkcs8.c \ genpkey.c genrsa.c nseq.c ocsp.c passwd.c pkcs12.c pkcs7.c pkcs8.c \
@@ -13,8 +13,8 @@ IF[{- !$disabled{apps} -}]
apps.c opt.c s_cb.c s_socket.c \ apps.c opt.c s_cb.c s_socket.c \
app_rand.c \ app_rand.c \
{- $target{apps_aux_src} -} {- $target{apps_aux_src} -}
INCLUDE[openssl]=.. ../include INCLUDE[gmssl]=.. ../include
DEPEND[openssl]=../libssl DEPEND[gmssl]=../libssl
SCRIPTS=CA.pl {- $tsget_name -} SCRIPTS=CA.pl {- $tsget_name -}
SOURCE[CA.pl]=CA.pl.in SOURCE[CA.pl]=CA.pl.in

0
apps/openssl.c → apps/gmssl.c
View File

4
include/openssl/opensslv.h
View File

@@ -41,9 +41,9 @@ extern "C" {
*/ */
# define OPENSSL_VERSION_NUMBER 0x1010004fL # define OPENSSL_VERSION_NUMBER 0x1010004fL
# ifdef OPENSSL_FIPS # ifdef OPENSSL_FIPS
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0d-fips 26 Jan 2017" # define OPENSSL_VERSION_TEXT "GmSSL 2.0 - OpenSSL 1.1.0d-fips 26 Jan 2017"
# else # else
# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0d 26 Jan 2017" # define OPENSSL_VERSION_TEXT "GmSSL 2.0 - OpenSSL 1.1.0d 26 Jan 2017"
# endif # endif
/*- /*-

2
util/mkdef.pl
View File

@@ -1557,7 +1557,7 @@ sub get_openssl_version()
open (IN, "$fn") || die "Can't open opensslv.h"; open (IN, "$fn") || die "Can't open opensslv.h";
while(<IN>) { while(<IN>) {
if (/OPENSSL_VERSION_TEXT\s+"OpenSSL (\d\.\d\.)(\d[a-z]*)(-| )/) { if (/OPENSSL_VERSION_TEXT\s+"GmSSL 2.0 - OpenSSL (\d\.\d\.)(\d[a-z]*)(-| )/) {
my $suffix = $2; my $suffix = $2;
(my $baseversion = $1) =~ s/\./_/g; (my $baseversion = $1) =~ s/\./_/g;
close IN; close IN;