diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-05-15 11:48:58 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-05-15 11:48:58 +0200 |
| commit | fe2b1323a3866ed0a9712e9d12e1f8f84793ec47 (patch) | |
| tree | 68cb2e839af0582679cceb316494da85efe78fa9 /lib | |
| parent | b2f0f8908f2e4277c171c956a3c3fdca130c2045 (diff) | |
| parent | 8a24056309f17154c807ec1a6f4ba5400d8bbc63 (diff) | |
| download | otp-fe2b1323a3866ed0a9712e9d12e1f8f84793ec47.tar.gz otp-fe2b1323a3866ed0a9712e9d12e1f8f84793ec47.tar.bz2 otp-fe2b1323a3866ed0a9712e9d12e1f8f84793ec47.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 9b6a61800f..61281a3fb2 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -171,7 +171,6 @@ next_record(_, #state{protocol_buffers = connection_states = ConnectionStates, ssl_options = #ssl_options{padding_check = Check}} = State) -> next_record(State, CipherTexts, ConnectionStates, Check); - next_record(connection, #state{protocol_buffers = #protocol_buffers{tls_cipher_texts = []}, protocol_specific = #{active_n_toggle := true} } = State) -> |