From 477d1a6234d5f4cf5ebfe022390cf5fff42b60fa Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 11 Sep 2018 22:34:00 +0000 Subject: [PATCH] minor fixes for Windows - fix to use secure URL in generated Windows resources - fix a potentially uninitialized variable CLA: trivial Reviewed-by: Richard Levitte Reviewed-by: Paul Dale Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/7189) --- crypto/cryptlib.c | 2 +- util/mkrc.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 3b878cd0c2..9e59e03ef6 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -198,7 +198,7 @@ int OPENSSL_isservice(void) if (_OPENSSL_isservice.p == NULL) { HANDLE mod = GetModuleHandle(NULL); - FARPROC f; + FARPROC f = NULL; if (mod != NULL) f = GetProcAddress(mod, "_OPENSSL_isservice"); diff --git a/util/mkrc.pl b/util/mkrc.pl index c177349c13..96f56f34d1 100755 --- a/util/mkrc.pl +++ b/util/mkrc.pl @@ -60,7 +60,7 @@ BEGIN BLOCK "040904b0" BEGIN // Required: - VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\\0" + VALUE "CompanyName", "The OpenSSL Project, https://www.openssl.org/\\0" VALUE "FileDescription", "$description\\0" VALUE "FileVersion", "$version\\0" VALUE "InternalName", "$basename\\0" -- 2.25.1