diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-09-21 15:23:47 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-09-21 15:23:47 +0200 |
| commit | 5ab628acc221618a2917d27f1e1fffe56e59dbb6 (patch) | |
| tree | 5f45fcb76a44b8ddc95acdb4f1c3e3a575b7eb0c /lib/ssl/src | |
| parent | 8382d11acc43a8cad3fc999aff8c72de3a150228 (diff) | |
| parent | 044f622ac3759001b0fa100e7dc5ab378caa4c72 (diff) | |
| download | otp-5ab628acc221618a2917d27f1e1fffe56e59dbb6.tar.gz otp-5ab628acc221618a2917d27f1e1fffe56e59dbb6.tar.bz2 otp-5ab628acc221618a2917d27f1e1fffe56e59dbb6.zip | |
Merge branch 'ia/ssl-asn1-spec-dss-params/OTP-7884' into dev
* ia/ssl-asn1-spec-dss-params/OTP-7884:
Handling of DSA key parameters
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_certificate_db.erl | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/ssl/src/ssl_certificate_db.erl b/lib/ssl/src/ssl_certificate_db.erl index 86477f369d..39d9847e3b 100644 --- a/lib/ssl/src/ssl_certificate_db.erl +++ b/lib/ssl/src/ssl_certificate_db.erl @@ -216,9 +216,15 @@ add_certs_from_file(File, Ref, CertsDb) -> [Add(Cert) || {'Certificate', Cert, not_encrypted} <- PemEntries]. add_certs(Cert, Ref, CertsDb) -> - ErlCert = public_key:pkix_decode_cert(Cert, otp), - TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate, - SerialNumber = TBSCertificate#'OTPTBSCertificate'.serialNumber, - Issuer = public_key:pkix_normalize_name( - TBSCertificate#'OTPTBSCertificate'.issuer), - insert({Ref, SerialNumber, Issuer}, {Cert,ErlCert}, CertsDb). + try ErlCert = public_key:pkix_decode_cert(Cert, otp), + TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate, + SerialNumber = TBSCertificate#'OTPTBSCertificate'.serialNumber, + Issuer = public_key:pkix_normalize_name( + TBSCertificate#'OTPTBSCertificate'.issuer), + insert({Ref, SerialNumber, Issuer}, {Cert,ErlCert}, CertsDb) + catch + error:Reason -> + Report = io_lib:format("SSL WARNING: Ignoring CA cert: ~p~n Due to decoding error:~p ~n", + [Cert, Reason]), + error_logger:info_report(Report) + end. |