Recent CTR mode changes stopped OS X PuTTY from compiling, because

[u/mdw/putty] / sshdes.c

diff --git a/sshdes.c b/sshdes.c
index 506e245..de5d35a 100644 (file)
--- a/sshdes.c
+++ b/sshdes.c
@@ -964,12 +964,14 @@ static const struct ssh2_cipher ssh_3des_ssh2 = {
     8, 168, "triple-DES CBC"
 };
 
+#ifndef ENABLE_3DES_SSH2_CTR
 static const struct ssh2_cipher ssh_3des_ssh2_ctr = {
     des3_make_context, des3_free_context, des3_iv, des3_key,
     des3_ssh2_sdctr, des3_ssh2_sdctr,
     "3des-ctr",
     8, 168, "triple-DES SDCTR"
 };
+#endif
 
 /*
  * Single DES in SSH-2. "des-cbc" is marked as HISTORIC in
@@ -1000,7 +1002,9 @@ static const struct ssh2_cipher ssh_des_sshcom_ssh2 = {
  * builds.
  */
 static const struct ssh2_cipher *const des3_list[] = {
-/*  &ssh_3des_ssh2_ctr, */
+#ifndef ENABLE_3DES_SSH2_CTR
+    &ssh_3des_ssh2_ctr,
+#endif
     &ssh_3des_ssh2
 };