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

Add official kex name "curve25519-sha256".

Browse Source 
As a simple alias for "curve25519-sha256@libssh.org". This name is now
standardised in RFC8731 (and, since 7751657811, we have the extra
validation mandated by the RFC compared to the libssh spec); also it's
been in OpenSSH at least for ages (since 7.4, 2016-12, 0493766d56).
This commit is contained in:
Jacob Nevins 2020-02-29 09:59:12 +00:00
parent 7751657811
commit e025ccc2f0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sshecc.c
View File

@ -1483,6 +1483,11 @@ static const struct eckex_extra kex_extra_curve25519 = {
ssh_ecdhkex_m_getkey, ssh_ecdhkex_m_getkey,
}; };
const ssh_kex ssh_ec_kex_curve25519 = { const ssh_kex ssh_ec_kex_curve25519 = {
"curve25519-sha256", NULL, KEXTYPE_ECDH,
&ssh_sha256, &kex_extra_curve25519,
};
/* Pre-RFC alias */
const ssh_kex ssh_ec_kex_curve25519_libssh = {
"curve25519-sha256@libssh.org", NULL, KEXTYPE_ECDH, "curve25519-sha256@libssh.org", NULL, KEXTYPE_ECDH,
&ssh_sha256, &kex_extra_curve25519, &ssh_sha256, &kex_extra_curve25519,
}; };
@ -1525,6 +1530,7 @@ const ssh_kex ssh_ec_kex_nistp521 = {
static const ssh_kex *const ec_kex_list[] = { static const ssh_kex *const ec_kex_list[] = {
&ssh_ec_kex_curve25519, &ssh_ec_kex_curve25519,
&ssh_ec_kex_curve25519_libssh,
&ssh_ec_kex_nistp256, &ssh_ec_kex_nistp256,
&ssh_ec_kex_nistp384, &ssh_ec_kex_nistp384,
&ssh_ec_kex_nistp521, &ssh_ec_kex_nistp521,