[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[matthias.st.pierre at ncp-e.com]

The branch OpenSSL_1_1_0-stable has been updated
       via  477d1a6234d5f4cf5ebfe022390cf5fff42b60fa (commit)
      from  e13dc23cc0fd64c304c25a67d5fa516a77f9e8f1 (commit)


- Log -----------------------------------------------------------------
commit 477d1a6234d5f4cf5ebfe022390cf5fff42b60fa
Author: Viktor Szakats <commit at vszakats.net>
Date:   Tue Sep 11 22:34:00 2018 +0000

    minor fixes for Windows
    
    - fix to use secure URL in generated Windows resources
    - fix a potentially uninitialized variable
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7189)

-----------------------------------------------------------------------

Summary of changes:
 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 3b878cd..9e59e03 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 c177349..96f56f3 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"