diff options
| -rw-r--r-- | crypto/src/cms/SignerInformation.cs | 10 | ||||
| -rw-r--r-- | crypto/test/src/cms/test/SignedDataTest.cs | 57 |
2 files changed, 67 insertions, 0 deletions
diff --git a/crypto/src/cms/SignerInformation.cs b/crypto/src/cms/SignerInformation.cs index ea9330db1..e8988902b 100644 --- a/crypto/src/cms/SignerInformation.cs +++ b/crypto/src/cms/SignerInformation.cs @@ -578,6 +578,16 @@ namespace Org.BouncyCastle.Cms return Arrays.ConstantTimeAreEqual(digest, sigHash); } + else if (algorithm.Equals("RSAandMGF1")) + { + ISigner sig = SignerUtilities.GetSigner("NONEWITHRSAPSS"); + + sig.Init(false, key); + + sig.BlockUpdate(digest, 0, digest.Length); + + return sig.VerifySignature(signature); + } else if (algorithm.Equals("DSA")) { ISigner sig = SignerUtilities.GetSigner("NONEwithDSA"); diff --git a/crypto/test/src/cms/test/SignedDataTest.cs b/crypto/test/src/cms/test/SignedDataTest.cs index 29d0464c2..b9e23f257 100644 --- a/crypto/test/src/cms/test/SignedDataTest.cs +++ b/crypto/test/src/cms/test/SignedDataTest.cs @@ -18,6 +18,7 @@ using Org.BouncyCastle.Utilities.Test; using Org.BouncyCastle.X509; using Org.BouncyCastle.X509.Store; using Org.BouncyCastle.Crypto.Operators; +using Org.BouncyCastle.Asn1.Utilities; namespace Org.BouncyCastle.Cms.Tests { @@ -394,6 +395,34 @@ namespace Org.BouncyCastle.Cms.Tests X509Certificate cert = (X509Certificate) certEnum.Current; Assert.IsTrue(signer.Verify(cert)); + + if (contentDigest != null) + { + Assert.IsTrue(Arrays.AreEqual(contentDigest, signer.GetContentDigest())); + } + } + } + + private void VerifyDirectSignatures( + CmsSignedData s, + byte[] contentDigest) + { + IX509Store x509Certs = s.GetCertificates("Collection"); + + SignerInformationStore signers = s.GetSignerInfos(); + ICollection c = signers.GetSigners(); + + foreach (SignerInformation signer in c) + { + ICollection certCollection = x509Certs.GetMatches(signer.SignerID); + + IEnumerator certEnum = certCollection.GetEnumerator(); + + certEnum.MoveNext(); + X509Certificate cert = (X509Certificate)certEnum.Current; + + Assert.IsTrue(signer.Verify(cert)); + Assert.IsTrue(null == signer.GetEncodedSignedAttributes()); if (contentDigest != null) { @@ -721,6 +750,12 @@ namespace Org.BouncyCastle.Cms.Tests } [Test] + public void TestSha256WithRsaPssDirect() + { + rsaPssDirectTest("SHA256", CmsSignedDataGenerator.DigestSha256); + } + + [Test] public void TestSha384WithRsaPss() { rsaPssTest("SHA384", CmsSignedDataGenerator.DigestSha384); @@ -916,6 +951,28 @@ namespace Org.BouncyCastle.Cms.Tests VerifySignatures(s, expectedDigest); } + private void rsaPssDirectTest( + string digestName, + string digestOID) + { + byte[] msgBytes = Encoding.ASCII.GetBytes("Hello World!"); + CmsProcessable msg = new CmsProcessableByteArray(msgBytes); + + IX509Store x509Certs = CmsTestUtil.MakeCertStore(OrigCert, SignCert); + + CmsSignedDataGenerator gen = new CmsSignedDataGenerator(); + gen.AddSignerInfoGenerator(new SignerInfoGeneratorBuilder().SetDirectSignature(true).Build( + new Asn1SignatureFactory(digestName + "withRSAandMGF1", OrigKP.Private), OrigCert)); + gen.AddCertificates(x509Certs); + + CmsSignedData s = gen.Generate(CmsSignedDataGenerator.Data, msg, false); + + // compute expected content digest + byte[] expectedDigest = DigestUtilities.CalculateDigest(digestName, msgBytes); + + VerifyDirectSignatures(s, expectedDigest); + } + private void SubjectKeyIDTest( AsymmetricCipherKeyPair signaturePair, X509Certificate signatureCert, |