diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-08-14 16:11:35 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-08-14 16:11:35 +0200 |
| commit | 794fcba226957bb74e59d0268c0a9501420e7416 (patch) | |
| tree | 078e12500c204e70ce6d711a943dfc3e82694f79 /lib/ssl/src | |
| parent | 9ccd5b239b885f9ebb16a519d6878932e42782dc (diff) | |
| parent | 4232ea037de2258b268bead0920fa73a539a0954 (diff) | |
| download | otp-794fcba226957bb74e59d0268c0a9501420e7416.tar.gz otp-794fcba226957bb74e59d0268c0a9501420e7416.tar.bz2 otp-794fcba226957bb74e59d0268c0a9501420e7416.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index 7004c7a2f4..2ad1386900 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -218,6 +218,9 @@ hello(#client_hello{client_version = ClientVersion, Version = ssl_handshake:select_version(tls_record, ClientVersion, Versions), do_hello(Version, Versions, CipherSuites, Hello, SslOpts, Info, Renegotiation) catch + error:{case_clause,{asn1, Asn1Reason}} -> + %% ASN-1 decode of certificate somehow failed + ?ALERT_REC(?FATAL, ?INTERNAL_ERROR, {failed_to_decode_own_certificate, Asn1Reason}); _:_ -> ?ALERT_REC(?FATAL, ?HANDSHAKE_FAILURE, malformed_handshake_data) end. |