diff options
author | Hans Nilsson <[email protected]> | 2015-08-29 08:45:34 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-08-29 08:45:34 +0200 |
commit | 8fac1e6b35b62321d98655866e8f76400c6d0cbf (patch) | |
tree | 9264b720c56b52f5e756e40eee078cd0b661dfbd /lib/ssh/test/ssh_basic_SUITE.erl | |
parent | 6b175e6785e476135d432c46daf0bbfba3aec621 (diff) | |
parent | 4b1202b1b683a2e7a4c7a0da41d4112e255801ec (diff) | |
download | otp-8fac1e6b35b62321d98655866e8f76400c6d0cbf.tar.gz otp-8fac1e6b35b62321d98655866e8f76400c6d0cbf.tar.bz2 otp-8fac1e6b35b62321d98655866e8f76400c6d0cbf.zip |
Merge branch 'maint'
* maint:
ssh: Elliptic Curve Diffie-Hellman (ECDH)
Diffstat (limited to 'lib/ssh/test/ssh_basic_SUITE.erl')
-rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl index 6dfff945ac..27b611780d 100644 --- a/lib/ssh/test/ssh_basic_SUITE.erl +++ b/lib/ssh/test/ssh_basic_SUITE.erl @@ -96,7 +96,10 @@ groups() -> {key_exchange, [], ['diffie-hellman-group-exchange-sha1', 'diffie-hellman-group-exchange-sha256', 'diffie-hellman-group1-sha1', - 'diffie-hellman-group14-sha1' + 'diffie-hellman-group14-sha1', + 'ecdh-sha2-nistp256', + 'ecdh-sha2-nistp384', + 'ecdh-sha2-nistp521' ]}, {dir_options, [], [user_dir_option, system_dir_option]} @@ -845,6 +848,15 @@ ssh_msg_debug_fun_option_client(Config) -> 'diffie-hellman-group14-sha1'(Config) -> kextest('diffie-hellman-group14-sha1',Config). +'ecdh-sha2-nistp256'(Config) -> + kextest('ecdh-sha2-nistp256',Config). + +'ecdh-sha2-nistp384'(Config) -> + kextest('ecdh-sha2-nistp384',Config). + +'ecdh-sha2-nistp521'(Config) -> + kextest('ecdh-sha2-nistp521',Config). + kextest(Kex, Config) -> case lists:member(Kex, ssh_transport:supported_algorithms(kex)) of |