Add exceptions for "VShell" to the ssh.com bug compatibility modes (which are

just numbers) in an attempt to fix `vshell-no-bug-compat'.
Not even tested a little bit.

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

diff --git a/ssh.c b/ssh.c
index 20a5ce4..ce57b22 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1813,6 +1813,7 @@ static void ssh_detect_bugs(Ssh ssh, char *vstring)
 
     if (ssh->cfg.sshbug_hmac2 == FORCE_ON ||
        (ssh->cfg.sshbug_hmac2 == AUTO &&
 
     if (ssh->cfg.sshbug_hmac2 == FORCE_ON ||
        (ssh->cfg.sshbug_hmac2 == AUTO &&

+        !wc_match("* VShell", imp) &&

         (wc_match("2.1.0*", imp) || wc_match("2.0.*", imp) ||
          wc_match("2.2.0*", imp) || wc_match("2.3.0*", imp) ||
          wc_match("2.1 *", imp)))) {
         (wc_match("2.1.0*", imp) || wc_match("2.0.*", imp) ||
          wc_match("2.2.0*", imp) || wc_match("2.3.0*", imp) ||
          wc_match("2.1 *", imp)))) {


@@ -1825,6 +1826,7 @@ static void ssh_detect_bugs(Ssh ssh, char *vstring)
 
     if (ssh->cfg.sshbug_derivekey2 == FORCE_ON ||
        (ssh->cfg.sshbug_derivekey2 == AUTO &&
 
     if (ssh->cfg.sshbug_derivekey2 == FORCE_ON ||
        (ssh->cfg.sshbug_derivekey2 == AUTO &&

+        !wc_match("* VShell", imp) &&

         (wc_match("2.0.0*", imp) || wc_match("2.0.10*", imp) ))) {
        /*
         * These versions have the key-derivation bug (failing to
         (wc_match("2.0.0*", imp) || wc_match("2.0.10*", imp) ))) {
        /*
         * These versions have the key-derivation bug (failing to