BUG_SSH2_DERIVEKEY is apparently only present in SSH 2.0.11 and

before, not in 2.0.13. Verified on at least one host. Fixes bug
`ssh2-keyderive-nonbug'.

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

diff --git a/ssh.c b/ssh.c
index 94d3d10..588c8c3 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1788,7 +1788,7 @@ static void ssh_detect_bugs(Ssh ssh, char *vstring)
 
     if (cfg.sshbug_derivekey2 == BUG_ON ||
        (cfg.sshbug_derivekey2 == BUG_AUTO &&
-        (wc_match("2.0.*", imp)))) {
+        (wc_match("2.0.0*", imp) || wc_match("2.0.1[01]*", imp) ))) {
        /*
         * These versions have the key-derivation bug (failing to
         * include the literal shared secret in the hashes that