X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ssh.c;h=bb8441afe906ade1c37a87c2dc5e27a2d82db38b;hb=f391d066de67fc172592d8dfd27902747fa3c833;hp=0d299eaf62f98391f169f3138c4d8d41499aa911;hpb=82e7fd0f2307d11912b519674fd63470b0da13c0;p=PuTTY.git

diff --git a/ssh.c b/ssh.c
index 0d299eaf..bb8441af 100644
--- a/ssh.c
+++ b/ssh.c
@@ -235,16 +235,6 @@ extern void pfd_override_throttle(Socket s, int enable);
 #define SSH_MAX_BACKLOG 32768
 #define OUR_V2_WINSIZE 16384
 
-/*
- * Ciphers for SSH2.
- */
-const static struct ssh2_ciphers *ciphers[] = {
-    &ssh2_aes,
-    &ssh2_blowfish,
-    &ssh2_3des,
-    &ssh2_des,
-};
-
 const static struct ssh_kex *kex_algs[] = {
     &ssh_diffiehellman_gex,
     &ssh_diffiehellman
@@ -1657,7 +1647,7 @@ static void ssh_sent(Plug plug, int bufsize)
  * Also places the canonical host name into `realhost'. It must be
  * freed by the caller.
  */
-static char *connect_to_host(char *host, int port, char **realhost)
+static char *connect_to_host(char *host, int port, char **realhost, int nodelay)
 {
     static struct plug_function_table fn_table = {
 	ssh_closing,
@@ -1714,7 +1704,7 @@ static char *connect_to_host(char *host, int port, char **realhost)
 	sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
 	logevent(buf);
     }
-    s = sk_new(addr, port, 0, 1, &fn_table_ptr);
+    s = sk_new(addr, port, 0, 1, nodelay, &fn_table_ptr);
     if ((err = sk_socket_error(s)))
 	return err;
 
@@ -3153,6 +3143,7 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt)
     static int n_preferred_ciphers;
     static const struct ssh2_ciphers *preferred_ciphers[CIPHER_MAX];
     static const struct ssh_compress *preferred_comp;
+    static int cipherstr_started;
     static int first_kex;
 
     crBegin;
@@ -3170,8 +3161,10 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt)
 	    n_preferred_ciphers++;
 	    break;
 	  case CIPHER_DES:
-	    preferred_ciphers[n_preferred_ciphers] = &ssh2_des;
-	    n_preferred_ciphers++;
+	    if (cfg.ssh2_des_cbc) {
+		preferred_ciphers[n_preferred_ciphers] = &ssh2_des;
+		n_preferred_ciphers++;
+	    }
 	    break;
 	  case CIPHER_3DES:
 	    preferred_ciphers[n_preferred_ciphers] = &ssh2_3des;
@@ -3231,24 +3224,28 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt)
     }
     /* List client->server encryption algorithms. */
     ssh2_pkt_addstring_start();
+    cipherstr_started = 0;
     for (i = 0; i < n_preferred_ciphers; i++) {
 	const struct ssh2_ciphers *c = preferred_ciphers[i];
 	if (!c) continue;	       /* warning flag */
 	for (j = 0; j < c->nciphers; j++) {
-	    ssh2_pkt_addstring_str(c->list[j]->name);
-	    if (i < n_preferred_ciphers || j < c->nciphers - 1)
+	    if (cipherstr_started)
 		ssh2_pkt_addstring_str(",");
+	    ssh2_pkt_addstring_str(c->list[j]->name);
+	    cipherstr_started = 1;
 	}
     }
     /* List server->client encryption algorithms. */
     ssh2_pkt_addstring_start();
+    cipherstr_started = 0;
     for (i = 0; i < n_preferred_ciphers; i++) {
 	const struct ssh2_ciphers *c = preferred_ciphers[i];
 	if (!c) continue; /* warning flag */
 	for (j = 0; j < c->nciphers; j++) {
-	    ssh2_pkt_addstring_str(c->list[j]->name);
-	    if (i < n_preferred_ciphers || j < c->nciphers - 1)
+	    if (cipherstr_started)
 		ssh2_pkt_addstring_str(",");
+	    ssh2_pkt_addstring_str(c->list[j]->name);
+	    cipherstr_started = 1;
 	}
     }
     /* List client->server MAC algorithms. */
@@ -5109,7 +5106,7 @@ static void ssh2_protocol(unsigned char *in, int inlen, int ispkt)
  *
  * Returns an error message, or NULL on success.
  */
-static char *ssh_init(char *host, int port, char **realhost)
+static char *ssh_init(char *host, int port, char **realhost, int nodelay)
 {
     char *p;
 
@@ -5125,7 +5122,7 @@ static char *ssh_init(char *host, int port, char **realhost)
     ssh_overall_bufsize = 0;
     ssh_fallback_cmd = 0;
 
-    p = connect_to_host(host, port, realhost);
+    p = connect_to_host(host, port, realhost, nodelay);
     if (p != NULL)
 	return p;