diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 9f0990ca..adbf34fe 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -676,7 +676,7 @@ lint: {- # because the program apps/openssl has object files as sources, and # they then have the corresponding C files as source, we need to chain # the lookups in %unified_info - my $apps_openssl = catfile("apps","openssl"); + my $apps_openssl = catfile("apps","gmssl"); our @openssl_source = map { @{$unified_info{sources}->{$_}} } @{$unified_info{sources}->{$apps_openssl}}; ""; -} diff --git a/apps/build.info b/apps/build.info index ae648619..e33771b9 100644 --- a/apps/build.info +++ b/apps/build.info @@ -1,9 +1,9 @@ {- our $tsget_name = $config{target} =~ /^(VC|vms)-/ ? "tsget.pl" : "tsget"; "" -} IF[{- !$disabled{apps} -}] - PROGRAMS=openssl - SOURCE[openssl]=\ - openssl.c \ + PROGRAMS=gmssl + SOURCE[gmssl]=\ + gmssl.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 \ 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 \ app_rand.c \ {- $target{apps_aux_src} -} - INCLUDE[openssl]=.. ../include - DEPEND[openssl]=../libssl + INCLUDE[gmssl]=.. ../include + DEPEND[gmssl]=../libssl SCRIPTS=CA.pl {- $tsget_name -} SOURCE[CA.pl]=CA.pl.in diff --git a/apps/openssl.c b/apps/gmssl.c similarity index 100% rename from apps/openssl.c rename to apps/gmssl.c diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index 445f6fa8..c9d5df99 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -41,9 +41,9 @@ extern "C" { */ # define OPENSSL_VERSION_NUMBER 0x1010004fL # 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 -# 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 /*- diff --git a/util/mkdef.pl b/util/mkdef.pl index b54c925c..15f309e7 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -1557,7 +1557,7 @@ sub get_openssl_version() open (IN, "$fn") || die "Can't open opensslv.h"; while() { - 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 $baseversion = $1) =~ s/\./_/g; close IN;