diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-06-14 16:21:58 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-06-14 16:21:58 +0200 |
| commit | 115b0fa6d1374de08789a9431dc34c633663f598 (patch) | |
| tree | 4ace8b631bda699f5da39a90dead8853e015565b /lib/ssl/doc/src/using_ssl.xml | |
| parent | 766b968d89e3cf0b2715ba4784887b1ae8c4181d (diff) | |
| parent | e91b2afc41716557bad662e346e9f978ee3156ba (diff) | |
| download | otp-115b0fa6d1374de08789a9431dc34c633663f598.tar.gz otp-115b0fa6d1374de08789a9431dc34c633663f598.tar.bz2 otp-115b0fa6d1374de08789a9431dc34c633663f598.zip | |
Merge branch 'ingela/ssl/21-enhanchment'
* ingela/ssl/21-enhanchment:
ssl: Add handle_continue/2 and document enhancements
Diffstat (limited to 'lib/ssl/doc/src/using_ssl.xml')
| -rw-r--r-- | lib/ssl/doc/src/using_ssl.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/using_ssl.xml b/lib/ssl/doc/src/using_ssl.xml index 3ef33df719..b2d649042b 100644 --- a/lib/ssl/doc/src/using_ssl.xml +++ b/lib/ssl/doc/src/using_ssl.xml @@ -66,7 +66,7 @@ ssl:listen(9999, [{certfile, "cert.pem"}, {keyfile, "key.pem"},{reuseaddr, true} {ok,{sslsocket, [...]}}</code> <p><em>Step 3:</em> Do a transport accept on the TLS listen socket:</p> - <code type="erl">3 server> {ok, Socket} = ssl:transport_accept(ListenSocket). + <code type="erl">3 server> {ok, TLSTransportSocket} = ssl:transport_accept(ListenSocket). {ok,{sslsocket, [...]}}</code> <p><em>Step 4:</em> Start the client side: </p> @@ -77,7 +77,7 @@ ok</code> {ok,{sslsocket, [...]}}</code> <p><em>Step 5:</em> Do the TLS handshake:</p> - <code type="erl">4 server> ok = ssl:ssl_accept(Socket). + <code type="erl">4 server> {ok, Socket} = ssl:handshake(TLSTransportSocket). ok</code> <p><em>Step 6:</em> Send a message over TLS:</p> @@ -126,7 +126,7 @@ ok</code> ok</code> <p><em>Step 6:</em> Do the TLS handshake:</p> - <code type="erl">5 server> {ok, TLSSocket} = ssl:ssl_accept(Socket, [{cacertfile, "cacerts.pem"}, + <code type="erl">5 server> {ok, TLSSocket} = ssl:handshake(Socket, [{cacertfile, "cacerts.pem"}, {certfile, "cert.pem"}, {keyfile, "key.pem"}]). {ok,{sslsocket,[...]}}</code> |