[openssl-commits] [openssl] master update

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

The branch master has been updated
       via  af7d8d3446d640018bbeb9879ac585025b949832 (commit)
      from  88ea3685e4bf30fc529fe46e19effc6317726de8 (commit)


- Log -----------------------------------------------------------------
commit af7d8d3446d640018bbeb9879ac585025b949832
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
    - fix an unused variable warning
    
    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/bio/b_sock2.c | 2 ++
 crypto/cryptlib.c    | 2 +-
 util/mkrc.pl         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/crypto/bio/b_sock2.c b/crypto/bio/b_sock2.c
index 823732d..5d82ab2 100644
--- a/crypto/bio/b_sock2.c
+++ b/crypto/bio/b_sock2.c
@@ -133,7 +133,9 @@ int BIO_connect(int sock, const BIO_ADDR *addr, int options)
  */
 int BIO_bind(int sock, const BIO_ADDR *addr, int options)
 {
+# ifndef OPENSSL_SYS_WINDOWS
     int on = 1;
+# endif
 
     if (sock == -1) {
         BIOerr(BIO_F_BIO_BIND, BIO_R_INVALID_SOCKET);
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index b1e535a..1cd77c9 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -204,7 +204,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 a221d51..6762bc4 100755
--- a/util/mkrc.pl
+++ b/util/mkrc.pl
@@ -70,7 +70,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", "$filename\\0"