diff options
| author | Oren Novotny <oren@novotny.org> | 2015-10-16 20:12:28 -0400 |
|---|---|---|
| committer | Oren Novotny <oren@novotny.org> | 2015-10-16 20:12:28 -0400 |
| commit | 424bd67b1ab4a909dd6f1d598ad862c30b90c4c6 (patch) | |
| tree | a0eee2d51cde61950401a6da34c23da8dcc37e76 /crypto/src/openssl/PEMReader.cs | |
| parent | Merge branch 'master' into master-vs12 (diff) | |
| parent | Port of non-blocking TLS API from Java (diff) | |
| download | BouncyCastle.NET-ed25519-424bd67b1ab4a909dd6f1d598ad862c30b90c4c6.tar.xz | |
Merge branch 'master' into master-vs12
Diffstat (limited to 'crypto/src/openssl/PEMReader.cs')
| -rw-r--r-- | crypto/src/openssl/PEMReader.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/src/openssl/PEMReader.cs b/crypto/src/openssl/PEMReader.cs index 8c19fe601..ec5d1b414 100644 --- a/crypto/src/openssl/PEMReader.cs +++ b/crypto/src/openssl/PEMReader.cs @@ -109,6 +109,7 @@ namespace Org.BouncyCastle.OpenSsl case "X509 CERTIFICATE": return ReadCertificate(obj); case "PKCS7": + case "CMS": return ReadPkcs7(obj); case "X509 CRL": return ReadCrl(obj); |