X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=proxy.c;h=190b8c99246861e38355a60c11d9f20d7bce57ed;hb=6ef62aacfc5108355532ce82dc8eae7b7dc70e39;hp=d3bcca69f63a7c6733ead1e65dcb4677c0021103;hpb=20f433efac8908e7024b3ae78fd8f6d3313f4d09;p=PuTTY.git

diff --git a/proxy.c b/proxy.c
index d3bcca69..190b8c99 100644
--- a/proxy.c
+++ b/proxy.c
@@ -859,15 +859,16 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
 	 *     0x03 = CHAP
 	 */
 
-	char command[4];
+	char command[5];
 	int len;
 
 	command[0] = 5; /* version 5 */
 	if (p->cfg.proxy_username[0] || p->cfg.proxy_password[0]) {
-	    command[1] = 2;	       /* two methods supported: */
 	    command[2] = 0x00;	       /* no authentication */
-	    command[3] = 0x02;	       /* username/password */
-	    len = 4;
+	    len = 3;
+	    proxy_socks5_offerencryptedauth (command, &len);
+	    command[len++] = 0x02;	       /* username/password */
+	    command[1] = len - 2;	/* Number of methods supported */
 	} else {
 	    command[1] = 1;	       /* one methods supported: */
 	    command[2] = 0x00;	       /* no authentication */
@@ -923,7 +924,7 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
 	     *    authentication methods:
 	     *     0x00 = no authentication
 	     *     0x01 = GSSAPI
-	     *     0x02 = username/password 
+	     *     0x02 = username/password
 	     *     0x03 = CHAP
 	     *     0xff = no acceptable methods
 	     */
@@ -988,6 +989,12 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
 	    p->state = 2;	       /* now proceed as authenticated */
 	}
 
+	if (p->state == 8) {
+	    int ret;
+	    ret = proxy_socks5_handlechap(p);
+	    if (ret) return ret;
+	}
+
 	if (p->state == 2) {
 
 	    /* request format:
@@ -1156,10 +1163,9 @@ int proxy_socks5_negotiate (Proxy_Socket p, int change)
 	}
 
 	if (p->state == 6) {
-	    /* TODO: Handle CHAP authentication */
-	    plug_closing(p->plug, "Proxy error: We don't support CHAP authentication",
-			 PROXY_ERROR_GENERAL, 0);
-	    return 1;
+	    int ret;
+	    ret = proxy_socks5_selectchap(p);
+	    if (ret) return ret;
 	}
 
     }