Remove last vestiges of `buggymac' in the Config structure. Might

have been cause of a Plink bug since it no longer got initialised.

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

diff --git a/putty.h b/putty.h
index 903695e..46e39c6 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -266,7 +266,6 @@ typedef struct {
     int ssh_cipherlist[CIPHER_MAX];
     char keyfile[FILENAME_MAX];
     int sshprot;                      /* use v1 or v2 when both available */
-    int buggymac;                     /* MAC bug commmercial <=v2.3.x SSH2 */
     int ssh2_des_cbc;                 /* "des-cbc" nonstandard SSH2 cipher */
     int try_tis_auth;
     int try_ki_auth;

diff --git a/ssh.c b/ssh.c
index e0fd106..3e8396f 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -3642,7 +3642,7 @@ static int do_ssh2_transport(unsigned char *in, int inlen, int ispkt)
     /*
      * Be prepared to work around the buggy MAC problem.
      */
-    if (cfg.buggymac || (ssh_remote_bugs & BUG_SSH2_HMAC))
+    if (ssh_remote_bugs & BUG_SSH2_HMAC)
        maclist = buggymacs, nmacs = lenof(buggymacs);
     else
        maclist = macs, nmacs = lenof(macs);