Now that we've got at least some SDCTR modes working (and aes256-ctr is our

[u/mdw/putty] / sshblowf.c

diff --git a/sshblowf.c b/sshblowf.c
index 4db83ba..0ca81eb 100644 (file)
--- a/sshblowf.c
+++ b/sshblowf.c
@@ -389,6 +389,7 @@ static void blowfish_msb_decrypt_cbc(unsigned char *blk, int len,
     ctx->iv1 = iv1;
 }
 
+#ifdef ENABLE_BLOWFISH_SSH2_CTR
 static void blowfish_msb_sdctr(unsigned char *blk, int len,
                                     BlowfishContext * ctx)
 {
@@ -414,6 +415,7 @@ static void blowfish_msb_sdctr(unsigned char *blk, int len,
     ctx->iv0 = iv0;
     ctx->iv1 = iv1;
 }
+#endif
 
 static void blowfish_setkey(BlowfishContext * ctx,
                            const unsigned char *key, short keybytes)
@@ -500,7 +502,7 @@ static void blowfish_key(void *handle, unsigned char *key)
     blowfish_setkey(ctx, key, 16);
 }
 
-#ifndef ENABLE_BLOWFISH_SSH2_CTR
+#ifdef ENABLE_BLOWFISH_SSH2_CTR
 static void blowfish256_key(void *handle, unsigned char *key)
 {
     BlowfishContext *ctx = (BlowfishContext *)handle;
@@ -552,7 +554,7 @@ static void blowfish_ssh2_decrypt_blk(void *handle, unsigned char *blk,
     blowfish_msb_decrypt_cbc(blk, len, ctx);
 }
 
-#ifndef ENABLE_BLOWFISH_SSH2_CTR
+#ifdef ENABLE_BLOWFISH_SSH2_CTR
 static void blowfish_ssh2_sdctr(void *handle, unsigned char *blk,
                                      int len)
 {
@@ -571,15 +573,15 @@ 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-128 CBC"
+    8, 128, SSH_CIPHER_IS_CBC, "Blowfish-128 CBC"
 };
 
-#ifndef ENABLE_BLOWFISH_SSH2_CTR
+#ifdef ENABLE_BLOWFISH_SSH2_CTR
 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, "Blowfish-256 SDCTR"
+    8, 256, 0, "Blowfish-256 SDCTR"
 };
 #endif
 
@@ -590,7 +592,7 @@ static const struct ssh2_cipher ssh_blowfish_ssh2_ctr = {
  * builds.
  */
 static const struct ssh2_cipher *const blowfish_list[] = {
-#ifndef ENABLE_BLOWFISH_SSH2_CTR
+#ifdef ENABLE_BLOWFISH_SSH2_CTR
     &ssh_blowfish_ssh2_ctr,
 #endif
     &ssh_blowfish_ssh2