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/src/ssl.erl | |
| 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/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 565cc9e1bc..eb5b351dd3 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -55,7 +55,7 @@ format_error/1, renegotiate/1, prf/5, negotiated_protocol/1, connection_information/1, connection_information/2]). %% Misc --export([handle_options/2, tls_version/1, new_ssl_options/3]). +-export([handle_options/2, tls_version/1, new_ssl_options/3, suite_to_str/1]). -deprecated({ssl_accept, 1, eventually}). -deprecated({ssl_accept, 2, eventually}). @@ -772,6 +772,16 @@ tls_version({3, _} = Version) -> tls_version({254, _} = Version) -> dtls_v1:corresponding_tls_version(Version). + +%%-------------------------------------------------------------------- +-spec suite_to_str(ssl_cipher:erl_cipher_suite()) -> string(). +%% +%% Description: Return the string representation of a cipher suite. +%%-------------------------------------------------------------------- +suite_to_str(Cipher) -> + ssl_cipher:suite_to_str(Cipher). + + %%%-------------------------------------------------------------- %%% Internal functions %%%-------------------------------------------------------------------- |