mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update defaults to install keys against major.minor

Browse Source 
we want patch level updates to use the same keys, so only create the key
against the major.minor version

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24450)
This commit is contained in:
Neil Horman 2024-06-27 11:12:23 -04:00
parent bf74cf35cf
commit caaea8f343
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/defaults.c
View File

@ -19,7 +19,7 @@
# define MAKESTR(x) TOSTR(x)
# define NOQUOTE(x) x
# if defined(OSSL_WINCTX)
# define REGISTRY_KEY "SOFTWARE\\WOW6432Node\\OpenSSL" ##"-"## NOQUOTE(OPENSSL_VERSION_STR) ##"-"## MAKESTR(OSSL_WINCTX)
# define REGISTRY_KEY "SOFTWARE\\WOW6432Node\\OpenSSL" ##"-"## MAKESTR(OPENSSL_VERSION_MAJOR) ##"."## MAKESTR(OPENSSL_VERSION_MINOR) ##"-"## MAKESTR(OSSL_WINCTX)
# endif
/**
@ -28,7 +28,7 @@
static char openssldir[MAX_PATH + 1];
/**
* @brief The pointer to the opennsldir buffer
* @brief The pointer to the openssldir buffer
*/
static char *openssldirptr = NULL;

8
test/recipes/02-test_windows_registry.t
View File

@ -27,7 +27,7 @@ $context =~ s/^.*: //;
@tempout = run(app(["openssl", "version", "-v"]), capture => 1);
my $version = "@tempout";
$version =~ s/^OpenSSL //;
$version =~ s/-.*\n//;
$version =~ s/(^[0-9]+\.[0-9]+)(.*$)/\1/;
my $regkey = "HKLM\\SOFTWARE\\OpenSSL-".$version."-".$context;
$regkey =~ s/\n//g;
@ -46,11 +46,11 @@ my @expectengdir = run(cmd(["reg.exe", "query", $regkey, "/reg:32", "/t", "REG_E
my @expectmoddir = run(cmd(["reg.exe", "query", $regkey, "/reg:32", "/t", "REG_EXPAND_SZ", "/v", "MODULESDIR"]), capture => 1);
my @osslversion = run(app(["openssl", "version", "-d"]), capture => 1);
my @ossldir = run(app(["openssl", "version", "-d"]), capture => 1);
print "@osslversion";
print "@ossldir";
$expect = "@expectossldir";
$actual = "@osslversion";
$actual = "@ossldir";
$expect =~ s/HKEY_LOCAL_MACHINE.*\n*//;
$expect =~ s/\n//g;
$expect =~ s/.*REG_EXPAND_SZ *//;