X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/8f1612752a89ea821dbd63491aef858f7f7e5bef..b50ee9a8fd3605c2fedfdcafc5901c7e8aebfbbd:/sshdes.c

diff --git a/sshdes.c b/sshdes.c
index 5fdb89a5..14ac7f68 100644
--- a/sshdes.c
+++ b/sshdes.c
@@ -744,6 +744,35 @@ static void des_cbc3_decrypt(unsigned char *dest, const unsigned char *src,
     scheds->iv1 = iv1;
 }
 
+static void des_sdctr3(unsigned char *dest, const unsigned char *src,
+			     unsigned int len, DESContext * scheds)
+{
+    word32 b[2], iv0, iv1, tmp;
+    unsigned int i;
+
+    assert((len & 7) == 0);
+
+    iv0 = scheds->iv0;
+    iv1 = scheds->iv1;
+    for (i = 0; i < len; i += 8) {
+	des_encipher(b, iv0, iv1, &scheds[2]);
+	des_decipher(b, b[0], b[1], &scheds[1]);
+	des_encipher(b, b[0], b[1], &scheds[0]);
+	tmp = GET_32BIT_MSB_FIRST(src);
+	PUT_32BIT_MSB_FIRST(dest, tmp ^ b[0]);
+	src += 4;
+	dest += 4;
+	tmp = GET_32BIT_MSB_FIRST(src);
+	PUT_32BIT_MSB_FIRST(dest, tmp ^ b[0]);
+	src += 4;
+	dest += 4;
+	if ((iv0 = (iv0 + 1) & 0xffffffff) == 0)
+	    iv1 = (iv1 + 1) & 0xffffffff;
+    }
+    scheds->iv0 = iv0;
+    scheds->iv1 = iv1;
+}
+
 static void *des3_make_context(void)
 {
     return snewn(3, DESContext);
@@ -751,7 +780,7 @@ static void *des3_make_context(void)
 
 static void *des3_ssh1_make_context(void)
 {
-    /* Need 3 keys for each direction, in SSH1 */
+    /* Need 3 keys for each direction, in SSH-1 */
     return snewn(6, DESContext);
 }
 
@@ -762,7 +791,7 @@ static void *des_make_context(void)
 
 static void *des_ssh1_make_context(void)
 {
-    /* Need one key for each direction, in SSH1 */
+    /* Need one key for each direction, in SSH-1 */
     return snewn(2, DESContext);
 }
 
@@ -827,6 +856,12 @@ static void des3_ssh2_decrypt_blk(void *handle, unsigned char *blk, int len)
     des_cbc3_decrypt(blk, blk, len, keys);
 }
 
+static void des3_ssh2_sdctr(void *handle, unsigned char *blk, int len)
+{
+    DESContext *keys = (DESContext *) handle;
+    des_sdctr3(blk, blk, len, keys);
+}
+
 static void des_ssh2_encrypt_blk(void *handle, unsigned char *blk, int len)
 {
     DESContext *keys = (DESContext *) handle;
@@ -938,11 +973,18 @@ static const struct ssh2_cipher ssh_3des_ssh2 = {
     des3_make_context, des3_free_context, des3_iv, des3_key,
     des3_ssh2_encrypt_blk, des3_ssh2_decrypt_blk,
     "3des-cbc",
-    8, 168, "triple-DES"
+    8, 168, "triple-DES CBC"
+};
+
+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"
 };
 
 /*
- * Single DES in ssh2. "des-cbc" is marked as HISTORIC in
+ * Single DES in SSH-2. "des-cbc" is marked as HISTORIC in
  * draft-ietf-secsh-assignednumbers-04.txt, referring to
  * FIPS-46-3.  ("Single DES (i.e., DES) will be permitted 
  * for legacy systems only.") , but ssh.com support it and 
@@ -953,10 +995,24 @@ static const struct ssh2_cipher ssh_des_ssh2 = {
     des_make_context, des3_free_context, des3_iv, des_key,
     des_ssh2_encrypt_blk, des_ssh2_decrypt_blk,
     "des-cbc",
-    8, 56, "single-DES"
+    8, 56, "single-DES CBC"
 };
 
+static const struct ssh2_cipher ssh_des_sshcom_ssh2 = {
+    des_make_context, des3_free_context, des3_iv, des_key,
+    des_ssh2_encrypt_blk, des_ssh2_decrypt_blk,
+    "des-cbc@ssh.com",
+    8, 56, "single-DES CBC"
+};
+
+/*
+ * "3des-ctr" is disabled because it hasn't had any interoperability
+ * testing, which is in turn because I couldn't find another implementation
+ * to test against.  Once it's been tested, it can be enabled in standard
+ * builds.
+ */
 static const struct ssh2_cipher *const des3_list[] = {
+/*  &ssh_3des_ssh2_ctr, */
     &ssh_3des_ssh2
 };
 
@@ -966,18 +1022,19 @@ const struct ssh2_ciphers ssh2_3des = {
 };
 
 static const struct ssh2_cipher *const des_list[] = {
-    &ssh_des_ssh2
+    &ssh_des_ssh2,
+    &ssh_des_sshcom_ssh2
 };
 
 const struct ssh2_ciphers ssh2_des = {
-    sizeof(des3_list) / sizeof(*des_list),
+    sizeof(des_list) / sizeof(*des_list),
     des_list
 };
 
 const struct ssh_cipher ssh_3des = {
     des3_ssh1_make_context, des3_free_context, des3_sesskey,
     des3_encrypt_blk, des3_decrypt_blk,
-    8, "triple-DES"
+    8, "triple-DES inner-CBC"
 };
 
 static void des_sesskey(void *handle, unsigned char *key)
@@ -1002,5 +1059,5 @@ static void des_decrypt_blk(void *handle, unsigned char *blk, int len)
 const struct ssh_cipher ssh_des = {
     des_ssh1_make_context, des3_free_context, des_sesskey,
     des_encrypt_blk, des_decrypt_blk,
-    8, "single-DES"
+    8, "single-DES CBC"
 };