Remove needless redeclaration of word32 (it was in ssh.h)

[PuTTY_svn.git] / sshblowf.c

diff --git a/sshblowf.c b/sshblowf.c
index 1d92d30c11199819dba227f09511ba8d82a104e6..f3c49b89e70426ad7aaa884e896a9b051c131a21 100644 (file)
--- a/sshblowf.c
+++ b/sshblowf.c
@@ -507,18 +507,14 @@ static void blowfish_ssh2_decrypt_blk(unsigned char *blk, int len)
     blowfish_msb_decrypt_cbc(blk, len, &dctx);
 }
 
-struct ssh_cipher ssh_blowfish_ssh1 = {
+const struct ssh_cipher ssh_blowfish_ssh1 = {
     blowfish_sesskey,
-    blowfish_csiv, blowfish_cskey,
-    blowfish_sciv, blowfish_sckey,
     blowfish_ssh1_encrypt_blk,
     blowfish_ssh1_decrypt_blk,
-    "blowfish-cbc",
-    8, 256
+    8
 };
 
-struct ssh_cipher ssh_blowfish_ssh2 = {
-    blowfish_sesskey,
+static const struct ssh2_cipher ssh_blowfish_ssh2 = {
     blowfish_csiv, blowfish_cskey,
     blowfish_sciv, blowfish_sckey,
     blowfish_ssh2_encrypt_blk,
@@ -526,3 +522,12 @@ struct ssh_cipher ssh_blowfish_ssh2 = {
     "blowfish-cbc",
     8, 128
 };
+
+static const struct ssh2_cipher *const blowfish_list[] = {
+    &ssh_blowfish_ssh2
+};
+
+const struct ssh2_ciphers ssh2_blowfish = {
+    sizeof(blowfish_list) / sizeof(*blowfish_list),
+    blowfish_list
+};