diff options
| author | Ingela Andin <[email protected]> | 2018-07-05 15:04:29 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-05 15:04:29 +0200 |
| commit | f67bc13009002c23695a02e8323226bc03eca3f5 (patch) | |
| tree | b9dbadd8410bbaad6d16cf39cf2eb120dd681152 /lib/ssl/doc/src/ssl.xml | |
| parent | 99789794474140049a1939c4e4789b28dfe80e49 (diff) | |
| parent | f610e27fe71d0b6a19eb836c3d13cc8de610b9ef (diff) | |
| download | otp-f67bc13009002c23695a02e8323226bc03eca3f5.tar.gz otp-f67bc13009002c23695a02e8323226bc03eca3f5.tar.bz2 otp-f67bc13009002c23695a02e8323226bc03eca3f5.zip | |
Merge pull request #1866 from IngelaAndin/ingela/ssl/PSK-hash-sign-selection/ERL-641
Failing to recognize PSK as an anonymous key exchange would fail the connection
when trying to decode an undefined certificate
OTP-15172
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 e3deb1c8a4..6e124c3513 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -1066,7 +1066,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> @@ -1074,6 +1074,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> |