summary refs log tree commit diff
path: root/crypto/src/cms
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2015-08-14 18:39:29 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2015-08-14 18:39:29 +0700
commit56f23bcdee9c54b6fa3222a759d8df3780e8ac68 (patch)
treee5fca176186ea692606506d78da2d57462abe43c /crypto/src/cms
parentAdd locking to lazy factory property (diff)
parentRefactor NextPacketTag() (diff)
downloadBouncyCastle.NET-ed25519-56f23bcdee9c54b6fa3222a759d8df3780e8ac68.tar.xz
Merge branch 'master' of git.bouncycastle.org:bc-csharp
Conflicts:
	crypto/src/asn1/x9/X9ECParametersHolder.cs
Diffstat (limited to 'crypto/src/cms')
-rw-r--r--crypto/src/cms/SignerInformation.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/src/cms/SignerInformation.cs b/crypto/src/cms/SignerInformation.cs
index 20af29a50..581286a3f 100644
--- a/crypto/src/cms/SignerInformation.cs
+++ b/crypto/src/cms/SignerInformation.cs
@@ -345,9 +345,12 @@ namespace Org.BouncyCastle.Cms
 //				if (sigParams != null)
 //					throw new CmsException("unrecognised signature parameters provided");
 
-				string signatureName = digestName + "with" + Helper.GetEncryptionAlgName(this.EncryptionAlgOid);
+                string signatureName = digestName + "with" + Helper.GetEncryptionAlgName(this.EncryptionAlgOid);
 
-				sig = Helper.GetSignatureInstance(signatureName);
+                sig = Helper.GetSignatureInstance(signatureName);
+
+                //sig = Helper.GetSignatureInstance(this.EncryptionAlgOid);
+                //sig = SignerUtilities.GetSigner(sigAlgOid);
 			}
 
 			try