Shout more loudly if we can't open a log file.

[PuTTY.git] / sshblowf.c

diff --git a/sshblowf.c b/sshblowf.c
index ca04c09cf0dfd94ae7448c8b7c60c4269805ddb9..8a106cbe94a89b693104fa525aea107db80f11a1 100644 (file)
--- a/sshblowf.c
+++ b/sshblowf.c
@@ -13,33 +13,30 @@ typedef struct {
     word32 iv0, iv1;                  /* for CBC mode */
 } BlowfishContext;
 
-#define GET_32BIT_LSB_FIRST(cp) \
-  (((unsigned long)(unsigned char)(cp)[0]) | \
-  ((unsigned long)(unsigned char)(cp)[1] << 8) | \
-  ((unsigned long)(unsigned char)(cp)[2] << 16) | \
-  ((unsigned long)(unsigned char)(cp)[3] << 24))
-
-#define PUT_32BIT_LSB_FIRST(cp, value) do { \
-  (cp)[0] = (value); \
-  (cp)[1] = (value) >> 8; \
-  (cp)[2] = (value) >> 16; \
-  (cp)[3] = (value) >> 24; } while (0)
-
-#define GET_32BIT_MSB_FIRST(cp) \
-  (((unsigned long)(unsigned char)(cp)[0] << 24) | \
-  ((unsigned long)(unsigned char)(cp)[1] << 16) | \
-  ((unsigned long)(unsigned char)(cp)[2] << 8) | \
-  ((unsigned long)(unsigned char)(cp)[3]))
-
-#define PUT_32BIT_MSB_FIRST(cp, value) do { \
-  (cp)[0] = (value) >> 24; \
-  (cp)[1] = (value) >> 16; \
-  (cp)[2] = (value) >> 8; \
-  (cp)[3] = (value); } while (0)
-
 /*
  * The Blowfish init data: hex digits of the fractional part of pi.
  * (ie pi as a hex fraction is 3.243F6A8885A308D3...)
+ *
+ * If you have Simon Tatham's 'spigot' exact real calculator
+ * available, or any other method of generating 8336 fractional hex
+ * digits of pi on standard output, you can regenerate these tables
+ * exactly as below using the following Perl script (adjusting the
+ * first line or two if your pi-generator is not spigot).
+
+open my $spig, "spigot -n -B16 -d8336 pi |";
+read $spig, $ignore, 2; # throw away the leading "3."
+for my $name ("parray", "sbox0".."sbox3") {
+    print "static const word32 ${name}[] = {\n";
+    my $len = $name eq "parray" ? 18 : 256;
+    for my $i (1..$len) {
+        read $spig, $word, 8;
+        printf "%s0x%s,", ($i%6==1 ? "    " : " "), uc $word;
+        print "\n" if ($i == $len || $i%6 == 0);
+    }
+    print "};\n\n";
+}
+close $spig;
+
  */
 static const word32 parray[] = {
     0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344, 0xA4093822, 0x299F31D0,
@@ -413,6 +410,32 @@ static void blowfish_msb_decrypt_cbc(unsigned char *blk, int len,
     ctx->iv1 = iv1;
 }
 
+static void blowfish_msb_sdctr(unsigned char *blk, int len,
+                                    BlowfishContext * ctx)
+{
+    word32 b[2], iv0, iv1, tmp;
+
+    assert((len & 7) == 0);
+
+    iv0 = ctx->iv0;
+    iv1 = ctx->iv1;
+
+    while (len > 0) {
+       blowfish_encrypt(iv0, iv1, b, ctx);
+       tmp = GET_32BIT_MSB_FIRST(blk);
+       PUT_32BIT_MSB_FIRST(blk, tmp ^ b[0]);
+       tmp = GET_32BIT_MSB_FIRST(blk + 4);
+       PUT_32BIT_MSB_FIRST(blk + 4, tmp ^ b[1]);
+       if ((iv1 = (iv1 + 1) & 0xffffffff) == 0)
+           iv0 = (iv0 + 1) & 0xffffffff;
+       blk += 8;
+       len -= 8;
+    }
+
+    ctx->iv0 = iv0;
+    ctx->iv1 = iv1;
+}
+
 static void blowfish_setkey(BlowfishContext * ctx,
                            const unsigned char *key, short keybytes)
 {
@@ -483,7 +506,7 @@ static void *blowfish_make_context(void)
 
 static void *blowfish_ssh1_make_context(void)
 {
-    /* In SSH1, need one key for each direction */
+    /* In SSH-1, need one key for each direction */
     return snewn(2, BlowfishContext);
 }
 
@@ -498,6 +521,12 @@ static void blowfish_key(void *handle, unsigned char *key)
     blowfish_setkey(ctx, key, 16);
 }
 
+static void blowfish256_key(void *handle, unsigned char *key)
+{
+    BlowfishContext *ctx = (BlowfishContext *)handle;
+    blowfish_setkey(ctx, key, 32);
+}
+
 static void blowfish_iv(void *handle, unsigned char *key)
 {
     BlowfishContext *ctx = (BlowfishContext *)handle;
@@ -542,20 +571,35 @@ static void blowfish_ssh2_decrypt_blk(void *handle, unsigned char *blk,
     blowfish_msb_decrypt_cbc(blk, len, ctx);
 }
 
+static void blowfish_ssh2_sdctr(void *handle, unsigned char *blk,
+                                     int len)
+{
+    BlowfishContext *ctx = (BlowfishContext *)handle;
+    blowfish_msb_sdctr(blk, len, ctx);
+}
+
 const struct ssh_cipher ssh_blowfish_ssh1 = {
     blowfish_ssh1_make_context, blowfish_free_context, blowfish_sesskey,
     blowfish_ssh1_encrypt_blk, blowfish_ssh1_decrypt_blk,
-    8, "Blowfish"
+    8, "Blowfish-128 CBC"
 };
 
 static const struct ssh2_cipher ssh_blowfish_ssh2 = {
     blowfish_make_context, blowfish_free_context, blowfish_iv, blowfish_key,
     blowfish_ssh2_encrypt_blk, blowfish_ssh2_decrypt_blk,
     "blowfish-cbc",
-    8, 128, "Blowfish"
+    8, 128, SSH_CIPHER_IS_CBC, "Blowfish-128 CBC"
+};
+
+static const struct ssh2_cipher ssh_blowfish_ssh2_ctr = {
+    blowfish_make_context, blowfish_free_context, blowfish_iv, blowfish256_key,
+    blowfish_ssh2_sdctr, blowfish_ssh2_sdctr,
+    "blowfish-ctr",
+    8, 256, 0, "Blowfish-256 SDCTR"
 };
 
 static const struct ssh2_cipher *const blowfish_list[] = {
+    &ssh_blowfish_ssh2_ctr,
     &ssh_blowfish_ssh2
 };