diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-12-20 09:51:32 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-12-20 09:51:32 +0100 |
| commit | 12d4c5b8ec6310952ee5e72c4a07b5d6bb2bf724 (patch) | |
| tree | 7b2ee758247a7aef1fcb385fc95f31258b04ecff /lib/ssl/src/tls_sender.erl | |
| parent | 11b53eb69628f16d2aaa49811fd060ddb1c91295 (diff) | |
| parent | 9aac178d30c5bad940e68a7eb8a36596df5ed903 (diff) | |
| download | otp-12d4c5b8ec6310952ee5e72c4a07b5d6bb2bf724.tar.gz otp-12d4c5b8ec6310952ee5e72c4a07b5d6bb2bf724.tar.bz2 otp-12d4c5b8ec6310952ee5e72c4a07b5d6bb2bf724.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl/src/tls_sender.erl')
| -rw-r--r-- | lib/ssl/src/tls_sender.erl | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl index 4399999221..1559fcbb37 100644 --- a/lib/ssl/src/tls_sender.erl +++ b/lib/ssl/src/tls_sender.erl @@ -29,7 +29,7 @@ %% API -export([start/0, start/1, initialize/2, send_data/2, send_alert/2, - send_and_ack_alert/2, setopts/2, renegotiate/1, downgrade/2, + send_and_ack_alert/2, setopts/2, renegotiate/1, peer_renegotiate/1, downgrade/2, update_connection_state/3, dist_tls_socket/1, dist_handshake_complete/3]). %% gen_statem callbacks @@ -119,6 +119,15 @@ setopts(Pid, Opts) -> renegotiate(Pid) -> %% Needs error handling for external API call(Pid, renegotiate). + +%%-------------------------------------------------------------------- +-spec peer_renegotiate(pid()) -> {ok, WriteState::map()} | {error, term()}. +%% Description: So TLS connection process can synchronize the +%% encryption state to be used when handshaking. +%%-------------------------------------------------------------------- +peer_renegotiate(Pid) -> + gen_statem:call(Pid, renegotiate, ?DEFAULT_TIMEOUT). + %%-------------------------------------------------------------------- -spec update_connection_state(pid(), WriteState::map(), tls_record:tls_version()) -> ok. %% Description: So TLS connection process can synchronize the |