From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Mon, 16 Apr 2001 07:49:11 +0000 (+0000)
Subject: After we fall back to 3DES, double-check the server really does
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/a99a05c03f42017703bff5f4a7f15d2a704eac95?hp=03169ad0902dcea0737ad7c92a9248e9fe6022e7

After we fall back to 3DES, double-check the server really does
support it, and bomb out with a complaint if not.


git-svn-id: svn://svn.tartarus.org/sgt/putty@1042 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/ssh.c b/ssh.c
index 8d310e1b..1c39fc47 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1510,6 +1510,11 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
     if ((supported_ciphers_mask & (1 << cipher_type)) == 0) {
 	c_write_str("Selected cipher not supported, falling back to 3DES\r\n");
 	cipher_type = SSH_CIPHER_3DES;
+	if ((supported_ciphers_mask & (1 << cipher_type)) == 0) {
+	    bombout(("Server violates SSH 1 protocol by "
+		     "not supporting 3DES encryption"));
+	    crReturn(0);
+	}
     }
     switch (cipher_type) {
       case SSH_CIPHER_3DES: logevent("Using 3DES encryption"); break;