diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-12-20 11:39:35 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-12-20 11:39:35 +0100 |
| commit | c0255143ff210b5643199061b1f4de4d7945f0e5 (patch) | |
| tree | aeec2d7a32c7a578f693b72742d40e33458d4d27 | |
| parent | fd6ad6cdc4c0dcd78d302bd5817e274e108889f1 (diff) | |
| parent | 0b75478c4acd6c22311f5f516ac5fcdca4a16b28 (diff) | |
| download | otp-c0255143ff210b5643199061b1f4de4d7945f0e5.tar.gz otp-c0255143ff210b5643199061b1f4de4d7945f0e5.tar.bz2 otp-c0255143ff210b5643199061b1f4de4d7945f0e5.zip | |
Merge branch 'ingela/Jxck/PR-1656/OTP-14843' into maint
* ingela/Jxck/PR-1656/OTP-14843:
remove duplicate operation for decode certificate
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index fd437f62d2..5e687b1bb7 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1034,7 +1034,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, _}} = |