aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-12-20 11:18:42 +0100
committerIngela Anderton Andin <[email protected]>2018-12-20 11:18:42 +0100
commit4a97c51559959915774caeca249a527f5f3d8ec4 (patch)
tree91f4a8115af2c0cfaa7de5985028434d1c97ce89
parentc70717d44859068cd9f8085b9aeb6956ab98bcc0 (diff)
parentfa5a02d895f8f5716c129e92f4f83fea8f5c2e10 (diff)
downloadotp-4a97c51559959915774caeca249a527f5f3d8ec4.tar.gz
otp-4a97c51559959915774caeca249a527f5f3d8ec4.tar.bz2
otp-4a97c51559959915774caeca249a527f5f3d8ec4.zip
Merge branch 'ingela/ssl/master/hs-correction'
* ingela/ssl/master/hs-correction: ssl: Correct number of arguments in master
-rw-r--r--lib/ssl/src/tls_connection.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index a49f0d99ca..b042baebcb 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -691,7 +691,7 @@ connection(internal, #hello_request{},
try tls_sender:peer_renegotiate(Pid) of
{ok, Write} ->
Hello = tls_handshake:client_hello(Host, Port, ConnectionStates, SslOpts,
- Cache, CacheCb, Renegotiation, Cert),
+ Cache, CacheCb, Renegotiation, Cert, undefined),
{State, Actions} = send_handshake(Hello, State0#state{connection_states = ConnectionStates#{current_write => Write}}),
next_event(hello, no_record, State#state{session = Session0#session{session_id
= Hello#client_hello.session_id}}, Actions)