X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/1b08e5d722504982bf871c6ea97a21a487c86f3e..86916870d36cb70e7ef0ea760e75a6ae8b2d83a5:/proxy.c?ds=sidebyside

diff --git a/proxy.c b/proxy.c
index 30a16c5c..a4847b9a 100644
--- a/proxy.c
+++ b/proxy.c
@@ -91,7 +91,7 @@ static void sk_proxy_close (Socket s)
     sfree(ps);
 }
 
-static int sk_proxy_write (Socket s, char *data, int len)
+static int sk_proxy_write (Socket s, const char *data, int len)
 {
     Proxy_Socket ps = (Proxy_Socket) s;
 
@@ -102,7 +102,7 @@ static int sk_proxy_write (Socket s, char *data, int len)
     return sk_write(ps->sub_socket, data, len);
 }
 
-static int sk_proxy_write_oob (Socket s, char *data, int len)
+static int sk_proxy_write_oob (Socket s, const char *data, int len)
 {
     Proxy_Socket ps = (Proxy_Socket) s;
 
@@ -415,7 +415,7 @@ Socket new_connection(SockAddr addr, char *hostname,
 	/* look-up proxy */
 	proxy_addr = sk_namelookup(cfg.proxy_host,
 				   &proxy_canonical_name);
-	if ((err = sk_addr_error(proxy_addr))) {
+	if ((err = sk_addr_error(proxy_addr)) != NULL) {
 	    ret->error = "Proxy error: Unable to resolve proxy host name";
 	    return (Socket)ret;
 	}
@@ -515,7 +515,8 @@ int proxy_http_negotiate (Proxy_Socket p, int change)
 	    len = strlen(buf);
 	    sprintf(buf2, "Proxy-Authorization: basic ");
 	    for (i = 0, j = strlen(buf2); i < len; i += 3, j += 4)
-		base64_encode_atom(buf+i, (len-i > 3 ? 3 : len-i), buf2+j);
+		base64_encode_atom((unsigned char *)(buf+i),
+				   (len-i > 3 ? 3 : len-i), buf2+j);
 	    strcpy(buf2+j, "\r\n");
 	    sk_write(p->sub_socket, buf2, strlen(buf2));
 	}
@@ -1247,7 +1248,7 @@ int proxy_telnet_negotiate (Proxy_Socket p, int change)
 
 			/* we only extract two hex characters */
 			if (i == 1) {
-			    sk_write(p->sub_socket, &v, 1);
+			    sk_write(p->sub_socket, (char *)&v, 1);
 			    eo++;
 			    break;
 			}