diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-03-13 14:48:35 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-03-13 14:48:35 +0100 |
| commit | 56207dab54862aee071db6f911ad3a447f1cab8f (patch) | |
| tree | a24b52b521fbe54e2c9a8df3da6e3efdd9a03a07 /lib/ssl/src/ssl_cipher.erl | |
| parent | 9285e0f558b1f39a241431e46691841bc0284d57 (diff) | |
| parent | 006f45a738a6612958381b2fcbf48586c008d911 (diff) | |
| download | otp-56207dab54862aee071db6f911ad3a447f1cab8f.tar.gz otp-56207dab54862aee071db6f911ad3a447f1cab8f.tar.bz2 otp-56207dab54862aee071db6f911ad3a447f1cab8f.zip | |
Merge branch 'ia/public_key/ISO-oids/OTP-10873' into maint
* ia/public_key/ISO-oids/OTP-10873:
public_key & ssl: Add support for ISO oids 1.3.14.3.2.29 and 1.3.14.3.2.27
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
| -rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 567690a413..d91e2a89a0 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2012. All Rights Reserved. +%% Copyright Ericsson AB 2007-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -483,10 +483,10 @@ filter(undefined, Ciphers) -> filter(DerCert, Ciphers) -> OtpCert = public_key:pkix_decode_cert(DerCert, otp), SigAlg = OtpCert#'OTPCertificate'.signatureAlgorithm, - case ssl_certificate:signature_type(SigAlg#'SignatureAlgorithm'.algorithm) of - rsa -> + case public_key:pkix_sign_types(SigAlg#'SignatureAlgorithm'.algorithm) of + {_, rsa} -> filter_rsa(OtpCert, Ciphers -- dsa_signed_suites()); - dsa -> + {_, dsa} -> Ciphers -- rsa_signed_suites() end. |