diff options
| author | Raimo Niskanen <[email protected]> | 2017-12-04 15:51:47 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2017-12-04 15:51:47 +0100 |
| commit | 1a5dd04e0958681a72984eba6b3cf026aaec0155 (patch) | |
| tree | fdbafe851d7d16ff4b5c1406f6133f5f9257cd41 /lib/ssl/src/inet_tls_dist.erl | |
| parent | 82ba688773599f59215d395ac5dec7c862e1358b (diff) | |
| parent | 964d2987e754d77327d7d11918c04c028be35a5d (diff) | |
| download | otp-1a5dd04e0958681a72984eba6b3cf026aaec0155.tar.gz otp-1a5dd04e0958681a72984eba6b3cf026aaec0155.tar.bz2 otp-1a5dd04e0958681a72984eba6b3cf026aaec0155.zip | |
Merge branch 'raimo/ssl-dist-optfile-backport/OTP-14657' into maint
* raimo/ssl-dist-optfile-backport/OTP-14657:
Use SNI when connecting
Use -ssl_dist_optfile options
Read in -ssl_dist_optfile to ETS
Facilitate test certs with common root
Stop checking DNS name for SNI
Diffstat (limited to 'lib/ssl/src/inet_tls_dist.erl')
| -rw-r--r-- | lib/ssl/src/inet_tls_dist.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl index 78094c474b..4c677b9c33 100644 --- a/lib/ssl/src/inet_tls_dist.erl +++ b/lib/ssl/src/inet_tls_dist.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2011-2016. All Rights Reserved. +%% Copyright Ericsson AB 2011-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -93,7 +93,11 @@ do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) -> ?trace("port_please(~p) -> version ~p~n", [Node,Version]), dist_util:reset_timer(Timer), - case ssl_tls_dist_proxy:connect(Driver, Address, TcpPort) of + case + ssl_tls_dist_proxy:connect( + Driver, Address, TcpPort, + [{server_name_indication, atom_to_list(Node)}]) + of {ok, Socket} -> HSData = connect_hs_data(Kernel, Node, MyNode, Socket, Timer, Version, Ip, TcpPort, Address, |