summary refs log tree commit diff
diff options
context:
space:
mode:
authorJeffrey Stedfast <jeff@xamarin.com>2015-03-06 11:37:42 -0500
committerJeffrey Stedfast <jeff@xamarin.com>2015-03-06 11:37:42 -0500
commit5dff97a2e0a08a94bfd15fe328dd4b2780b6c8fb (patch)
tree27923823444ef98ea0c0c732796263f48b60ce24
parentAdded TlsPskIdentityManager.cs to the build (diff)
parentFix parsing of implicit tagged object (diff)
downloadBouncyCastle.NET-ed25519-5dff97a2e0a08a94bfd15fe328dd4b2780b6c8fb.tar.xz
Merge branch 'master' into vs2010
-rw-r--r--crypto/src/asn1/cms/EncryptedData.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/src/asn1/cms/EncryptedData.cs b/crypto/src/asn1/cms/EncryptedData.cs
index 5b8378282..cb109a640 100644
--- a/crypto/src/asn1/cms/EncryptedData.cs
+++ b/crypto/src/asn1/cms/EncryptedData.cs
@@ -52,8 +52,8 @@ namespace Org.BouncyCastle.Asn1.Cms
 
 			if (seq.Count > 2)
 			{
-				this.unprotectedAttrs = Asn1Set.GetInstance(seq[2]);
-			}
+                this.unprotectedAttrs = Asn1Set.GetInstance((Asn1TaggedObject)seq[2], false);
+            }
 		}
 
 		public virtual DerInteger Version