aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-12-20 11:40:34 +0100
committerIngela Anderton Andin <[email protected]>2017-12-20 11:40:34 +0100
commitb5587617f473ae71f463fccdedea1dc6ed0a042b (patch)
treee4b6b1dc46d484ea9afdab6a39eccf989d5921d4
parentd0e24bb70eafd5b1e61b1af5f703bf9343075b53 (diff)
parentc0255143ff210b5643199061b1f4de4d7945f0e5 (diff)
downloadotp-b5587617f473ae71f463fccdedea1dc6ed0a042b.tar.gz
otp-b5587617f473ae71f463fccdedea1dc6ed0a042b.tar.bz2
otp-b5587617f473ae71f463fccdedea1dc6ed0a042b.zip
Merge branch 'maint'
-rw-r--r--lib/ssl/src/ssl_handshake.erl1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl
index 1ef298083a..0c55af9174 100644
--- a/lib/ssl/src/ssl_handshake.erl
+++ b/lib/ssl/src/ssl_handshake.erl
@@ -1065,7 +1065,6 @@ select_hashsign(HashSigns, Cert, KeyExAlgo,
select_hashsign(HashSigns, Cert, KeyExAlgo, tls_v1:default_signature_algs(Version), Version);
select_hashsign(#hash_sign_algos{hash_sign_algos = HashSigns}, Cert, KeyExAlgo, SupportedHashSigns,
{Major, Minor}) when Major >= 3 andalso Minor >= 3 ->
- #'OTPCertificate'{tbsCertificate = TBSCert} = public_key:pkix_decode_cert(Cert, otp),
#'OTPCertificate'{tbsCertificate = TBSCert,
signatureAlgorithm = {_,SignAlgo, _}} = public_key:pkix_decode_cert(Cert, otp),
#'OTPSubjectPublicKeyInfo'{algorithm = {_, SubjAlgo, _}} =