aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src/ssl_handshake.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-06-17 16:51:13 +0200
committerErlang/OTP <[email protected]>2019-06-17 16:51:13 +0200
commite68145c61ad3ecbb81fd58bf32110da9e45d3deb (patch)
treed038a7401089f62ffc293677a44c3c04d3167634 /lib/ssl/src/ssl_handshake.erl
parentb4fb2e5669acb02697d9a9ab168eb0fbff6f370c (diff)
parentfaaf5bb3085d351715672684c6f6f9601ad1208a (diff)
downloadotp-e68145c61ad3ecbb81fd58bf32110da9e45d3deb.tar.gz
otp-e68145c61ad3ecbb81fd58bf32110da9e45d3deb.tar.bz2
otp-e68145c61ad3ecbb81fd58bf32110da9e45d3deb.zip
Merge branch 'ingela/ssl/handshake-handling/ERL-968/OTP-15879' into maint-22
* ingela/ssl/handshake-handling/ERL-968/OTP-15879: ssl: Correct handshake handling
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
-rw-r--r--lib/ssl/src/ssl_handshake.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index f68d3e9b26..c8135e6b94 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -363,7 +363,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 ->