X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d2a0e0be6953a1ae78e400669090dc2bde01c58e..d3a22f7952add0b13fac029efb18faae537795bd:/sshdes.c

diff --git a/sshdes.c b/sshdes.c
index 0b47aab6..1665b3d6 100644
--- a/sshdes.c
+++ b/sshdes.c
@@ -790,8 +790,7 @@ void des3_encrypt_pubkey(unsigned char *key,
     des_3cbc_encrypt(blk, blk, len, ourkeys);
 }
 
-struct ssh_cipher ssh_3des_ssh2 = {
-    NULL,
+static const struct ssh2_cipher ssh_3des_ssh2 = {
     des3_csiv, des3_cskey,
     des3_sciv, des3_sckey,
     des3_ssh2_encrypt_blk,
@@ -800,13 +799,20 @@ struct ssh_cipher ssh_3des_ssh2 = {
     8, 168
 };
 
-struct ssh_cipher ssh_3des = {
+static const struct ssh2_cipher *const des3_list[] = {
+    &ssh_3des_ssh2
+};
+
+const struct ssh2_ciphers ssh2_3des = {
+    sizeof(des3_list) / sizeof(*des3_list),
+    des3_list
+};
+
+const struct ssh_cipher ssh_3des = {
     des3_sesskey,
-    NULL, NULL, NULL, NULL,
     des3_encrypt_blk,
     des3_decrypt_blk,
-    "3des-cbc",
-    8, 168
+    8
 };
 
 static void des_sesskey(unsigned char *key) {
@@ -823,11 +829,9 @@ static void des_decrypt_blk(unsigned char *blk, int len) {
     des_cbc_decrypt(blk, blk, len, cskeys);
 }
 
-struct ssh_cipher ssh_des = {
+const struct ssh_cipher ssh_des = {
     des_sesskey,
-    NULL, NULL, NULL, NULL,            /* SSH 2 bits - unused */
     des_encrypt_blk,
     des_decrypt_blk,
-    "des-cbc", /* should never be used - not a valid cipher in ssh2 */
-    8, 56
+    8
 };