Support for selecting AES from the GUI. In the process, I've had to

[u/mdw/putty] / sshblowf.c

diff --git a/sshblowf.c b/sshblowf.c
index 1d92d30..99d8373 100644 (file)
--- a/sshblowf.c
+++ b/sshblowf.c
@@ -509,16 +509,12 @@ static void blowfish_ssh2_decrypt_blk(unsigned char *blk, int len)
 
 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 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 struct ssh2_cipher *blowfish_list[] = {
+    &ssh_blowfish_ssh2
+};
+
+struct ssh2_ciphers ssh2_blowfish = {
+    sizeof(blowfish_list) / sizeof(*blowfish_list),
+    blowfish_list
+};