aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-10-11 12:32:41 +0200
committerIngela Anderton Andin <[email protected]>2018-10-11 12:32:41 +0200
commit6163856b3bd78d1948a8e9e91e646d6c169aa310 (patch)
tree8853f53e7124b51b4bab233e7a10841b8d1a844f /lib/ssl/src
parentb0e23e7b54909be811a962cc1cf075cfbea403b9 (diff)
downloadotp-6163856b3bd78d1948a8e9e91e646d6c169aa310.tar.gz
otp-6163856b3bd78d1948a8e9e91e646d6c169aa310.tar.bz2
otp-6163856b3bd78d1948a8e9e91e646d6c169aa310.zip
ssl: Fix up incorrect automatic merge
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/tls_sender.erl7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl
index e9383998ce..8d1938cee7 100644
--- a/lib/ssl/src/tls_sender.erl
+++ b/lib/ssl/src/tls_sender.erl
@@ -111,13 +111,6 @@ setopts(Pid, Opts) ->
call(Pid, {set_opts, Opts}).
%%--------------------------------------------------------------------
--spec setopts(pid(), [{packet, integer() | atom()}]) -> ok | {error, term()}.
-%% Description: Send application data
-%%--------------------------------------------------------------------
-setopts(Pid, Opts) ->
- call(Pid, {set_opts, Opts}).
-
-%%--------------------------------------------------------------------
-spec renegotiate(pid()) -> {ok, WriteState::map()} | {error, closed}.
%% Description: So TLS connection process can synchronize the
%% encryption state to be used when handshaking.