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 14ac7f6..de5d35a 100644 (file)
--- a/sshdes.c
+++ b/sshdes.c
@@ -600,18 +600,6 @@ static void des_decipher(word32 * output, word32 L, word32 R,
     output[1] = R;
 }
 
-#define GET_32BIT_MSB_FIRST(cp) \
-  (((unsigned long)(unsigned char)(cp)[3]) | \
-  ((unsigned long)(unsigned char)(cp)[2] << 8) | \
-  ((unsigned long)(unsigned char)(cp)[1] << 16) | \
-  ((unsigned long)(unsigned char)(cp)[0] << 24))
-
-#define PUT_32BIT_MSB_FIRST(cp, value) do { \
-  (cp)[3] = (value); \
-  (cp)[2] = (value) >> 8; \
-  (cp)[1] = (value) >> 16; \
-  (cp)[0] = (value) >> 24; } while (0)
-
 static void des_cbc_encrypt(unsigned char *dest, const unsigned char *src,
                            unsigned int len, DESContext * sched)
 {
@@ -976,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
@@ -1012,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
 };