nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Now that we've got at least some SDCTR modes working (and aes256-ctr is our

Browse Source 
default preferred cipher), add code to inject SSH_MSG_IGNOREs to randomise
the IV when using CBC-mode ciphers.  Each cipher has a flag to indicate
whether it needs this workaround, and the SSH packet output maze has gained
some extra complexity to implement it.

[originally from svn r5659]
This commit is contained in:
Ben Harris
2005-04-23 16:22:51 +00:00
parent b28330fc35
commit f2b0335c48
6 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sshdes.c
View File

@ -965,7 +965,7 @@ static const struct ssh2_cipher ssh_3des_ssh2 = {
des3_make_context, des3_free_context, des3_iv, des3_key,
des3_ssh2_encrypt_blk, des3_ssh2_decrypt_blk,
"3des-cbc",
8, 168, "triple-DES CBC"
8, 168, SSH_CIPHER_IS_CBC, "triple-DES CBC"
};
#ifdef ENABLE_3DES_SSH2_CTR
@ -973,7 +973,7 @@ static const struct ssh2_cipher ssh_3des_ssh2_ctr = {
des3_make_context, des3_free_context, des3_iv, des3_key,
des3_ssh2_sdctr, des3_ssh2_sdctr,
"3des-ctr",
8, 168, "triple-DES SDCTR"
8, 168, 0, "triple-DES SDCTR"
};
#endif
@ -989,14 +989,14 @@ static const struct ssh2_cipher ssh_des_ssh2 = {
des_make_context, des3_free_context, des3_iv, des_key,
des_ssh2_encrypt_blk, des_ssh2_decrypt_blk,
"des-cbc",
8, 56, "single-DES CBC"
8, 56, SSH_CIPHER_IS_CBC, "single-DES CBC"
};
static const struct ssh2_cipher ssh_des_sshcom_ssh2 = {
des_make_context, des3_free_context, des3_iv, des_key,
des_ssh2_encrypt_blk, des_ssh2_decrypt_blk,
"des-cbc@ssh.com",
8, 56, "single-DES CBC"
8, 56, SSH_CIPHER_IS_CBC, "single-DES CBC"
};
/*