diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-07-05 15:08:18 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-07-05 15:08:18 +0200 |
| commit | 1ad63034139f1540957821406a2fd78ed0f5048d (patch) | |
| tree | 0adc385299231f20a6bed61c44535b2bf58d4b34 /lib/ssl/doc/src/ssl.xml | |
| parent | bc15cafa37d9b42b8676a40b3befea2e68cacd1b (diff) | |
| parent | f67bc13009002c23695a02e8323226bc03eca3f5 (diff) | |
| download | otp-1ad63034139f1540957821406a2fd78ed0f5048d.tar.gz otp-1ad63034139f1540957821406a2fd78ed0f5048d.tar.bz2 otp-1ad63034139f1540957821406a2fd78ed0f5048d.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/doc/src/ssl.xml')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 2f4cc7d8d7..60dc59d55c 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -1077,7 +1077,7 @@ fun(srp, Username :: string(), UserState :: term()) -> </fsummary> <type> <v>SslSocket = sslsocket()</v> - <v>Item = protocol | cipher_suite | sni_hostname | ecc | session_id | atom()</v> + <v>Item = protocol | selected_cipher_suite | sni_hostname | ecc | session_id | atom()</v> <d>Meaningful atoms, not specified above, are the ssl option names.</d> <v>Result = [{Item::atom(), Value::term()}]</v> <v>Reason = term()</v> @@ -1085,6 +1085,9 @@ fun(srp, Username :: string(), UserState :: term()) -> <desc><p>Returns the most relevant information about the connection, ssl options that are undefined will be filtered out. Note that values that affect the security of the connection will only be returned if explicitly requested by connection_information/2.</p> + <note><p>The legacy <c>Item = cipher_suite</c> is still supported + and returns the cipher suite on its (undocumented) legacy format. + It should be replaced by <c>selected_cipher_suite</c>.</p></note> </desc> </func> |