diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-06-13 11:33:59 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-06-13 11:33:59 +0200 |
| commit | 40600b34aa67bcf3bfce5b4cb16ef27f0068edc6 (patch) | |
| tree | 01014561d014dcd96771baf6b05d554760021929 /lib/ssl/src | |
| parent | a23b67ba65ca853bcecb8e76a2dce741ecfddfdc (diff) | |
| parent | faaf5bb3085d351715672684c6f6f9601ad1208a (diff) | |
| download | otp-40600b34aa67bcf3bfce5b4cb16ef27f0068edc6.tar.gz otp-40600b34aa67bcf3bfce5b4cb16ef27f0068edc6.tar.bz2 otp-40600b34aa67bcf3bfce5b4cb16ef27f0068edc6.zip | |
Merge branch 'ingela/ssl/handshake-handling/ERL-968/OTP-15879' into maint
* ingela/ssl/handshake-handling/ERL-968/OTP-15879:
ssl: Correct handshake handling
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 53676ab355..1f0c95701b 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -364,7 +364,7 @@ certify(#certificate{asn1_certificates = ASN1Certs}, CertDbHandle, CertDbRef, CertDbHandle, CertDbRef) end catch - error:{badmatch,{asn1, Asn1Reason}} -> + error:{badmatch,{error, {asn1, Asn1Reason}}} -> %% ASN-1 decode of certificate somehow failed ?ALERT_REC(?FATAL, ?CERTIFICATE_UNKNOWN, {failed_to_decode_certificate, Asn1Reason}); error:OtherReason -> diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index 2651fc09bd..dabc2f8ec8 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -317,8 +317,7 @@ handle_protocol_record(#ssl_tls{type = ?HANDSHAKE, fragment = Data}, _ -> HsEnv = State#state.handshake_env, {next_state, StateName, - State#state{protocol_buffers = Buffers, - handshake_env = + State#state{handshake_env = HsEnv#handshake_env{unprocessed_handshake_events = unprocessed_events(Events)}}, Events} end |