nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-01 11:32:48 -05:00
Code Issues Projects Releases Wiki Activity

Allow a cipher to override the SSH KEX's choice of MAC.

Browse Source 
No cipher uses this facility yet, but one shortly will.
This commit is contained in:
Chris Staite
2015-06-07 13:40:11 +01:00
committed by Simon Tatham
parent 3ce4594d14
commit 705f159255
10 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sshaes.c
View File

@ -1173,49 +1173,56 @@ static const struct ssh2_cipher ssh_aes128_ctr = {
aes_make_context, aes_free_context, aes_iv, aes128_key,
aes_ssh2_sdctr, aes_ssh2_sdctr,
"aes128-ctr",
16, 128, 0, "AES-128 SDCTR"
16, 128, 0, "AES-128 SDCTR",
NULL
};
static const struct ssh2_cipher ssh_aes192_ctr = {
aes_make_context, aes_free_context, aes_iv, aes192_key,
aes_ssh2_sdctr, aes_ssh2_sdctr,
"aes192-ctr",
16, 192, 0, "AES-192 SDCTR"
16, 192, 0, "AES-192 SDCTR",
NULL
};
static const struct ssh2_cipher ssh_aes256_ctr = {
aes_make_context, aes_free_context, aes_iv, aes256_key,
aes_ssh2_sdctr, aes_ssh2_sdctr,
"aes256-ctr",
16, 256, 0, "AES-256 SDCTR"
16, 256, 0, "AES-256 SDCTR",
NULL
};
static const struct ssh2_cipher ssh_aes128 = {
aes_make_context, aes_free_context, aes_iv, aes128_key,
aes_ssh2_encrypt_blk, aes_ssh2_decrypt_blk,
"aes128-cbc",
16, 128, SSH_CIPHER_IS_CBC, "AES-128 CBC"
16, 128, SSH_CIPHER_IS_CBC, "AES-128 CBC",
NULL
};
static const struct ssh2_cipher ssh_aes192 = {
aes_make_context, aes_free_context, aes_iv, aes192_key,
aes_ssh2_encrypt_blk, aes_ssh2_decrypt_blk,
"aes192-cbc",
16, 192, SSH_CIPHER_IS_CBC, "AES-192 CBC"
16, 192, SSH_CIPHER_IS_CBC, "AES-192 CBC",
NULL
};
static const struct ssh2_cipher ssh_aes256 = {
aes_make_context, aes_free_context, aes_iv, aes256_key,
aes_ssh2_encrypt_blk, aes_ssh2_decrypt_blk,
"aes256-cbc",
16, 256, SSH_CIPHER_IS_CBC, "AES-256 CBC"
16, 256, SSH_CIPHER_IS_CBC, "AES-256 CBC",
NULL
};
static const struct ssh2_cipher ssh_rijndael_lysator = {
aes_make_context, aes_free_context, aes_iv, aes256_key,
aes_ssh2_encrypt_blk, aes_ssh2_decrypt_blk,
"rijndael-cbc@lysator.liu.se",
16, 256, SSH_CIPHER_IS_CBC, "AES-256 CBC"
16, 256, SSH_CIPHER_IS_CBC, "AES-256 CBC",
NULL
};
static const struct ssh2_cipher *const aes_list[] = {