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

[u/mdw/putty] / sshdes.c

diff --git a/sshdes.c b/sshdes.c
index bc1fe59..491c906 100644 (file)
--- a/sshdes.c
+++ b/sshdes.c
@@ -1,8 +1,4 @@
 #include <assert.h>
-#include <stdio.h> /* FIXME */
-#include <stdarg.h> /* FIXME */
-#include <windows.h> /* FIXME */
-#include "putty.h" /* FIXME */
 #include "ssh.h"
 
 
@@ -782,22 +778,40 @@ void des3_decrypt_pubkey(unsigned char *key,
     des_3cbc_decrypt(blk, blk, len, ourkeys);
 }
 
-struct ssh_cipher ssh_3des_ssh2 = {
-    NULL,
+void des3_encrypt_pubkey(unsigned char *key,
+                         unsigned char *blk, int len) {
+    DESContext ourkeys[3];
+    des_key_setup(GET_32BIT_MSB_FIRST(key),
+                  GET_32BIT_MSB_FIRST(key+4), &ourkeys[0]);
+    des_key_setup(GET_32BIT_MSB_FIRST(key+8),
+                  GET_32BIT_MSB_FIRST(key+12), &ourkeys[1]);
+    des_key_setup(GET_32BIT_MSB_FIRST(key),
+                  GET_32BIT_MSB_FIRST(key+4), &ourkeys[2]);
+    des_3cbc_encrypt(blk, blk, len, ourkeys);
+}
+
+static struct ssh2_cipher ssh_3des_ssh2 = {
     des3_csiv, des3_cskey,
     des3_sciv, des3_sckey,
     des3_ssh2_encrypt_blk,
     des3_ssh2_decrypt_blk,
     "3des-cbc",
-    8
+    8, 168
+};
+
+static struct ssh2_cipher *des3_list[] = {
+    &ssh_3des_ssh2
+};
+
+struct ssh2_ciphers ssh2_3des = {
+    sizeof(des3_list) / sizeof(*des3_list),
+    des3_list
 };
 
 struct ssh_cipher ssh_3des = {
     des3_sesskey,
-    NULL, NULL, NULL, NULL,
     des3_encrypt_blk,
     des3_decrypt_blk,
-    "3des-cbc",
     8
 };
 
@@ -817,9 +831,7 @@ static void des_decrypt_blk(unsigned char *blk, int len) {
 
 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
 };