Commit f8e1c190 authored by Viktor Szakats's avatar Viktor Szakats Committed by Dr. Matthias St. Pierre
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/7189)
parent 6258e244

crypto/bio/b_sock2.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

crypto/cryptlib.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

util/mkrc.pl

+1 −1
Original line number Diff line number Diff line
@@ -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"