~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Terminal now uses unsorted counted tree234 as its basic data type.
[sgt/putty]
/
sshdes.c
diff --git
a/sshdes.c
b/sshdes.c
index
1be340c
..
1665b3d
100644
(file)
--- a/
sshdes.c
+++ b/
sshdes.c
@@
-790,22
+790,28
@@
void des3_encrypt_pubkey(unsigned char *key,
des_3cbc_encrypt(blk, blk, len, ourkeys);
}
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,
des3_ssh2_decrypt_blk,
"3des-cbc",
des3_csiv, des3_cskey,
des3_sciv, des3_sckey,
des3_ssh2_encrypt_blk,
des3_ssh2_decrypt_blk,
"3des-cbc",
- 8
+ 8, 168
+};
+
+static const struct ssh2_cipher *const des3_list[] = {
+ &ssh_3des_ssh2
};
};
-struct ssh_cipher ssh_3des = {
+const struct ssh2_ciphers ssh2_3des = {
+ sizeof(des3_list) / sizeof(*des3_list),
+ des3_list
+};
+
+const struct ssh_cipher ssh_3des = {
des3_sesskey,
des3_sesskey,
- NULL, NULL, NULL, NULL,
des3_encrypt_blk,
des3_decrypt_blk,
des3_encrypt_blk,
des3_decrypt_blk,
- "3des-cbc",
8
};
8
};
@@
-823,11
+829,9
@@
static void des_decrypt_blk(unsigned char *blk, int len) {
des_cbc_decrypt(blk, blk, len, cskeys);
}
des_cbc_decrypt(blk, blk, len, cskeys);
}
-struct ssh_cipher ssh_des = {
+
const
struct ssh_cipher ssh_des = {
des_sesskey,
des_sesskey,
- NULL, NULL, NULL, NULL, /* SSH 2 bits - unused */
des_encrypt_blk,
des_decrypt_blk,
des_encrypt_blk,
des_decrypt_blk,
- "des-cbc", /* should never be used - not a valid cipher in ssh2 */
8
};
8
};