mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-09 18:04:25 +09:00
kex: Add sntrup761x25519-sha512@openssh.com.
All of the initial work was done by Simon. Jakub cleaned up the formatting issues, resolved the padding of bignum to match specs and be interoperable with OpenSSH (and few more minor details). Closes: #194. Signed-off-by: Simon Josefsson <simon@josefsson.org> Signed-off-by: Jakub Jelen <jjelen@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org> Reviewed-by: Sahana Prasad <sahana@redhat.com>
This commit is contained in:
committed by
Jakub Jelen
parent
3468cc0dc5
commit
4becc8eb82
@@ -216,6 +216,7 @@ static void torture_options_set_key_exchange(void **state)
|
||||
/* Test known kexes */
|
||||
rc = ssh_options_set(session,
|
||||
SSH_OPTIONS_KEY_EXCHANGE,
|
||||
"sntrup761x25519-sha512@openssh.com,"
|
||||
"curve25519-sha256,curve25519-sha256@libssh.org,"
|
||||
"ecdh-sha2-nistp256,diffie-hellman-group16-sha512,"
|
||||
"diffie-hellman-group18-sha512,"
|
||||
@@ -230,6 +231,7 @@ static void torture_options_set_key_exchange(void **state)
|
||||
"diffie-hellman-group14-sha256");
|
||||
} else {
|
||||
assert_string_equal(session->opts.wanted_methods[SSH_KEX],
|
||||
"sntrup761x25519-sha512@openssh.com,"
|
||||
"curve25519-sha256,curve25519-sha256@libssh.org,"
|
||||
"ecdh-sha2-nistp256,diffie-hellman-group16-sha512,"
|
||||
"diffie-hellman-group18-sha512,"
|
||||
@@ -278,6 +280,7 @@ static void torture_options_get_key_exchange(void **state)
|
||||
} else {
|
||||
assert_string_equal(value,
|
||||
"curve25519-sha256,curve25519-sha256@libssh.org,"
|
||||
"sntrup761x25519-sha512@openssh.com,"
|
||||
"ecdh-sha2-nistp256,ecdh-sha2-nistp384,"
|
||||
"ecdh-sha2-nistp521,diffie-hellman-group18-sha512,"
|
||||
"diffie-hellman-group16-sha512,"
|
||||
@@ -1312,7 +1315,7 @@ static void torture_options_copy(void **state)
|
||||
"BindAddress 127.0.0.2\n"
|
||||
"GlobalKnownHostsFile /etc/ssh/known_hosts2\n"
|
||||
"UserKnownHostsFile ~/.ssh/known_hosts2\n"
|
||||
"KexAlgorithms curve25519-sha256,ecdh-sha2-nistp521\n"
|
||||
"KexAlgorithms curve25519-sha256,sntrup761x25519-sha512@openssh.com,ecdh-sha2-nistp521\n"
|
||||
"Ciphers aes256-ctr\n"
|
||||
"MACs hmac-sha2-256\n"
|
||||
"HostKeyAlgorithms ssh-ed25519,ecdsa-sha2-nistp521\n"
|
||||
|
||||
Reference in New Issue
Block a user