Disable SHA256 if not supported.

[openssl.git] / apps / s_socket.c

diff --git a/apps/s_socket.c b/apps/s_socket.c
index a9228f42a6b2b433ffdb263cd0b7a6fe59422e9c..209958ab908b0e8bcc3eb0506cc080da12e1927f 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -96,7 +96,8 @@ static struct hostent *GetHostByName(char *name);
 static void ssl_sock_cleanup(void);
 #endif
 static int ssl_sock_init(void);
-static int init_client_ip(int *sock,unsigned char ip[4], int port, int type);
+static int init_client_ip(int *sock, const unsigned char ip[4], int port,
+                         int type);
 static int init_server(int *sock, int port, int type);
 static int init_server_long(int *sock, int port,char *ip, int type);
 static int do_accept(int acc_sock, int *sock, char **host);
@@ -232,6 +233,7 @@ int init_client(int *sock, char *host, int port, int type)
        {
        unsigned char ip[4];
 
+       ip[0] = ip[1] = ip[2] = ip[3] = 0;
        if (!host_ip(host,&(ip[0])))
                {
                return(0);
@@ -239,7 +241,8 @@ int init_client(int *sock, char *host, int port, int type)
        return(init_client_ip(sock,ip,port,type));
        }
 
-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
+static int init_client_ip(int *sock, const unsigned char ip[4], int port,
+                         int type)
        {
        unsigned long addr;
        struct sockaddr_in them;
@@ -400,6 +403,7 @@ redoit:
        if (ret == INVALID_SOCKET)
                {
 #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
+               int i;
                i=WSAGetLastError();
                BIO_printf(bio_err,"accept error %d\n",i);
 #else