Merge branch 'master-vs12' into pcl

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);