diff options
| author | Viktor Szakats <commit@vszakats.net> | 2018-09-11 22:34:00 +0000 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2018-09-12 09:16:07 +0200 |
| commit | af7d8d3446d640018bbeb9879ac585025b949832 (patch) | |
| tree | fd5683129f64ab32f075c83cafdd92c84049124f | |
| parent | 88ea3685e4bf30fc529fe46e19effc6317726de8 (diff) | |
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@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/7189)
| -rw-r--r-- | crypto/bio/b_sock2.c | 2 | ||||
| -rw-r--r-- | crypto/cryptlib.c | 2 | ||||
| -rwxr-xr-x | 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 823732d64e..5d82ab22dc 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 b1e535a695..1cd77c96d2 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 a221d51765..6762bc4a56 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" |