diff options
author | Péter Dimitrov <[email protected]> | 2018-06-12 09:49:08 +0200 |
---|---|---|
committer | Péter Dimitrov <[email protected]> | 2018-06-12 09:49:08 +0200 |
commit | 43bd7fbfe23533f59b74ec6accad48c0c26b71a7 (patch) | |
tree | 6d789814c0c56a2c944d22c486aeae95c9e84c47 /lib/ssl/test | |
parent | 438218baad361fdd2666d29f8ed3a0bcc9eeae60 (diff) | |
parent | bb960a900d697c636947c788ff89306639c904a5 (diff) | |
download | otp-43bd7fbfe23533f59b74ec6accad48c0c26b71a7.tar.gz otp-43bd7fbfe23533f59b74ec6accad48c0c26b71a7.tar.bz2 otp-43bd7fbfe23533f59b74ec6accad48c0c26b71a7.zip |
Merge branch 'peterdmv/ssl/suite_to_str/ERL-600/OTP-15106'
* peterdmv/ssl/suite_to_str/ERL-600/OTP-15106:
ssl: Add new API function suite_to_str/1
Change-Id: Icf214ece4e1d281da12b02dadc63d4a2ca346563
Diffstat (limited to 'lib/ssl/test')
-rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 162c63850f..e8fb25e0e4 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -108,7 +108,8 @@ basic_tests() -> clear_pem_cache, defaults, fallback, - cipher_format + cipher_format, + suite_to_str ]. basic_tests_tls() -> @@ -1227,7 +1228,27 @@ cipher_format(Config) when is_list(Config) -> ssl:close(Socket1), {ok, Socket2} = ssl:listen(0, [{ciphers, ssl:cipher_suites(openssl)}]), ssl:close(Socket2). - + +%%-------------------------------------------------------------------- +suite_to_str() -> + [{doc, "Test that the suite_to_str API works"}]. +suite_to_str(Config) when is_list(Config) -> + "TLS_EMPTY_RENEGOTIATION_INFO_SCSV" = + ssl:suite_to_str(#{key_exchange => null, + cipher => null, + mac => null, + prf => null}), + "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" = + ssl:suite_to_str(#{key_exchange => ecdhe_ecdsa, + cipher => aes_128_gcm, + mac => aead, + prf => sha256}), + "TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256" = + ssl:suite_to_str(#{key_exchange => ecdh_rsa, + cipher => aes_128_cbc, + mac => sha256, + prf => sha256}). + %%-------------------------------------------------------------------- peername() -> |