diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-06-12 17:48:01 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-06-13 11:30:55 +0200 |
| commit | faaf5bb3085d351715672684c6f6f9601ad1208a (patch) | |
| tree | c730f6a8d484349f1dbaad6ae65c889cf6357d2c /lib/ssl/src | |
| parent | 7fe7fa3dde556b5b92522f8279d465bb52baf1f6 (diff) | |
| download | otp-faaf5bb3085d351715672684c6f6f9601ad1208a.tar.gz otp-faaf5bb3085d351715672684c6f6f9601ad1208a.tar.bz2 otp-faaf5bb3085d351715672684c6f6f9601ad1208a.zip | |
ssl: Correct handshake handling
Solves ERL-968, a refactoring bug could cause part of a server key exchange message to
be appended, to an incorrectly duplicated, certificate handshake message. In the end
causing an ASN1 decoding error. That in turn did not end up the correct error handling branch.
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 29db1b07c4..24d517fb5f 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -357,7 +357,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 52e5db731a..fe9537157b 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -272,8 +272,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 |