diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-08-07 13:07:57 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-08-07 13:07:57 +0200 |
| commit | 83bf5bea4b872be40253a8f25c9aec3b79d6d66f (patch) | |
| tree | 823c2303ef3ef7fc1ba531f200c6d57e8f8f66d5 | |
| parent | 66d69480b30a3d01bcc9e0dcf4e534a65fe74325 (diff) | |
| parent | cfebc7ca5667807768755e0a0cdac641e8fbb54d (diff) | |
| download | otp-83bf5bea4b872be40253a8f25c9aec3b79d6d66f.tar.gz otp-83bf5bea4b872be40253a8f25c9aec3b79d6d66f.tar.bz2 otp-83bf5bea4b872be40253a8f25c9aec3b79d6d66f.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 2b9b641459..6efa022a79 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -200,14 +200,14 @@ | sect163r1 | sect163r2 | secp160k1 | secp160r1 | secp160r2</c></p></item> <tag><c>hello_extensions() =</c></tag> - <item><p><c>#{renegotiation_info => + <item><p><c>#{renegotiation_info => binary() | undefined, signature_algs => [{hash(), ecsda| rsa| dsa}] | undefined alpn => binary() | undefined, - next_protocol_negotiation, + next_protocol_negotiation => binary() | undefined, srp => string() | undefined, - ec_point_formats , - elliptic_curves = [oid] | undefined - sni = string()} + ec_point_formats => list() | undefined, + elliptic_curves => [oid] | undefined, + sni => string() | undefined} }</c></p></item> |