diff options
| author | Rickard Green <[email protected]> | 2018-08-20 15:33:57 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-08-20 15:33:57 +0200 |
| commit | be45eaca8f1260f392974db882e21f3591e8923f (patch) | |
| tree | 464da1af4a6ab2917356471c6857f469a1f850d3 | |
| parent | 48a3d57d456158ac1aafb1d2495bd222004f037c (diff) | |
| parent | f2fec6ae41ba9300404614e96b3833613ee1db0d (diff) | |
| download | otp-be45eaca8f1260f392974db882e21f3591e8923f.tar.gz otp-be45eaca8f1260f392974db882e21f3591e8923f.tar.bz2 otp-be45eaca8f1260f392974db882e21f3591e8923f.zip | |
Merge branch 'maint'
* maint:
erts/time_correction.xml: remove extra closing parenthesis
use ssl:handshake/1 function
| -rw-r--r-- | erts/doc/src/time_correction.xml | 2 | ||||
| -rw-r--r-- | lib/ssl/examples/src/client_server.erl | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/erts/doc/src/time_correction.xml b/erts/doc/src/time_correction.xml index 77e7a40529..53b555387c 100644 --- a/erts/doc/src/time_correction.xml +++ b/erts/doc/src/time_correction.xml @@ -940,7 +940,7 @@ EventTag = {Time, UMI}</code> </item> <item> <seealso marker="erlang#system_info_os_system_time_source"> - <c>erlang:system_info(os_system_time_source)</c></seealso>) + <c>erlang:system_info(os_system_time_source)</c></seealso> </item> </list> diff --git a/lib/ssl/examples/src/client_server.erl b/lib/ssl/examples/src/client_server.erl index c150f43bff..7a266f544d 100644 --- a/lib/ssl/examples/src/client_server.erl +++ b/lib/ssl/examples/src/client_server.erl @@ -39,15 +39,15 @@ start() -> %% Accept {ok, ASock} = ssl:transport_accept(LSock), - ok = ssl:ssl_accept(ASock), + {ok, SslSocket} = ssl:handshake(ASock), io:fwrite("Accept: accepted.~n"), - {ok, Cert} = ssl:peercert(ASock), + {ok, Cert} = ssl:peercert(SslSocket), io:fwrite("Accept: peer cert:~n~p~n", [public_key:pkix_decode_cert(Cert, otp)]), io:fwrite("Accept: sending \"hello\".~n"), - ssl:send(ASock, "hello"), - {error, closed} = ssl:recv(ASock, 0), + ssl:send(SslSocket, "hello"), + {error, closed} = ssl:recv(SslSocket, 0), io:fwrite("Accept: detected closed.~n"), - ssl:close(ASock), + ssl:close(SslSocket), io:fwrite("Listen: closing and terminating.~n"), ssl:close(LSock), @@ -75,7 +75,7 @@ mk_opts(Role) -> [{active, false}, {verify, 2}, {depth, 2}, + {server_name_indication, disable}, {cacertfile, filename:join([Dir, Role, "cacerts.pem"])}, {certfile, filename:join([Dir, Role, "cert.pem"])}, {keyfile, filename:join([Dir, Role, "key.pem"])}]. - |