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

Use aes256-ctr when exporting new-style OpenSSH keys.

Browse Source 
This mimics behavior of OpenSSH 7.6 or later.
This commit is contained in:
Tim Kosse 2018-04-09 09:38:52 +02:00 committed by Simon Tatham
parent eaac8768e4
commit 044a9304e3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
import.c
View File

@ -1803,7 +1803,7 @@ int openssh_new_write(const Filename *filename, struct ssh2_userkey *key,
unsigned char *q; unsigned char *q;
for (i = 0; i < (int)sizeof(bcrypt_salt); i++) for (i = 0; i < (int)sizeof(bcrypt_salt); i++)
bcrypt_salt[i] = random_byte(); bcrypt_salt[i] = random_byte();
p += put_string_z(p, "aes256-cbc"); p += put_string_z(p, "aes256-ctr");
p += put_string_z(p, "bcrypt"); p += put_string_z(p, "bcrypt");
q = p; q = p;
p += 4; p += 4;
@ -1866,8 +1866,8 @@ int openssh_new_write(const Filename *filename, struct ssh2_userkey *key,
ctx = aes_make_context(); ctx = aes_make_context();
aes256_key(ctx, keybuf); aes256_key(ctx, keybuf);
aes_iv(ctx, keybuf + 32); aes_iv(ctx, keybuf + 32);
aes_ssh2_encrypt_blk(ctx, private_section_start, aes_ssh2_sdctr(ctx, private_section_start,
p - private_section_start); p - private_section_start);
aes_free_context(ctx); aes_free_context(ctx);
smemclr(keybuf, sizeof(keybuf)); smemclr(keybuf, sizeof(keybuf));