SSH 2 support, phase 1, debugging. Currently does Diffie-Hellman and gets

[u/mdw/putty] / sshdes.c

diff --git a/sshdes.c b/sshdes.c
index aae172f..0e90e64 100644 (file)
--- a/sshdes.c
+++ b/sshdes.c
@@ -662,7 +662,7 @@ static void des_3cbc_decrypt(unsigned char *dest, const unsigned char *src,
     des_cbc_decrypt(dest, src, len, &scheds[0]);
 }
 
-DESContext keys[3];
+static DESContext keys[3];
 
 static void des3_sesskey(unsigned char *key) {
     des_key_setup(GET_32BIT_MSB_FIRST(key),
@@ -685,7 +685,9 @@ static void des3_decrypt_blk(unsigned char *blk, int len) {
 struct ssh_cipher ssh_3des = {
     des3_sesskey,
     des3_encrypt_blk,
-    des3_decrypt_blk
+    des3_decrypt_blk,
+    "3des-cbc",
+    8
 };
 
 static void des_sesskey(unsigned char *key) {
@@ -705,5 +707,7 @@ static void des_decrypt_blk(unsigned char *blk, int len) {
 struct ssh_cipher ssh_des = {
     des_sesskey,
     des_encrypt_blk,
-    des_decrypt_blk
+    des_decrypt_blk,
+    "des-cbc", /* should never be used - not a valid cipher in ssh2 */
+    8
 };