Fixes decoding of CMS/PKCS #7 messages with an explicit cryptographic…

… object identifier
mono · Mar 6, 2018 · f28abdb · f28abdb
1 parent 2dc56b5
commit f28abdb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs b/mcs/class/System.Security/System.Security.Cryptography.Pkcs/SignerInfo.cs
@@ -46,7 +46,7 @@ public sealed class SignerInfo {
 		// only accessible from SignedPkcs7.SignerInfos
 		internal SignerInfo (string hashName, X509Certificate2 certificate, SubjectIdentifierType type, object o, int version)
 		{
-			_digest = new Oid (CryptoConfig.MapNameToOID (hashName));
+			_digest = new Oid (CryptoConfig.MapNameToOID (hashName) ?? hashName);
 			_certificate = certificate;
 			_counter = new SignerInfoCollection ();
 			_signed = new CryptographicAttributeObjectCollection ();