diff options
| author | David Hook <dgh@cryptoworkshop.com> | 2014-03-21 07:20:12 +0400 |
|---|---|---|
| committer | David Hook <dgh@cryptoworkshop.com> | 2014-03-21 07:20:12 +0400 |
| commit | 4b15777d76a19909f3d49a5270d78f4cabf1b846 (patch) | |
| tree | 4b384a370a622775724cede7400f130e5edf965b /pkix/src | |
| parent | e488f3b4fbd8b50d24c448b49472fa04bca327d4 (diff) | |
| parent | 7f81ae1108058471738c311287cd400e9fba9762 (diff) | |
Merge branch 'trustcert' of https://github.com/scop/bc-java into scop-trustcert
Diffstat (limited to 'pkix/src')
| -rw-r--r-- | pkix/src/main/java/org/bouncycastle/openssl/PEMParser.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkix/src/main/java/org/bouncycastle/openssl/PEMParser.java b/pkix/src/main/java/org/bouncycastle/openssl/PEMParser.java index 672f3da5..dacdba44 100644 --- a/pkix/src/main/java/org/bouncycastle/openssl/PEMParser.java +++ b/pkix/src/main/java/org/bouncycastle/openssl/PEMParser.java @@ -63,6 +63,7 @@ public class PEMParser parsers.put("CERTIFICATE REQUEST", new PKCS10CertificationRequestParser()); parsers.put("NEW CERTIFICATE REQUEST", new PKCS10CertificationRequestParser()); parsers.put("CERTIFICATE", new X509CertificateParser()); + parsers.put("TRUSTED CERTIFICATE", new X509CertificateParser()); parsers.put("X509 CERTIFICATE", new X509CertificateParser()); parsers.put("X509 CRL", new X509CRLParser()); parsers.put("PKCS7", new PKCS7Parser()); |