added use of IKeyWrapper for managing CMS KeyTransRecipient

novotnyllc · Jan 18, 2019 · e0d1810 · e0d1810
1 parent 714e5ef
commit e0d1810
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/crypto/test/src/crmf/test/CrmfTest.cs b/crypto/test/src/crmf/test/CrmfTest.cs
@@ -21,6 +21,7 @@
 using Org.BouncyCastle.Utilities.Encoders;
 using Org.BouncyCastle.Utilities.Test;
 using Org.BouncyCastle.X509;
+using Org.BouncyCastle.Operators;
 
 namespace Org.BouncyCastle.Crmf.Tests
 {
@@ -114,12 +115,8 @@ public void TestBasicMessageWithArchiveControl()
 
             certificateRequestMessageBuilder.AddControl(
                 new PKIArchiveControlBuilder(privateInfo, new GeneralName(new X509Name("CN=Test")))
-                    .AddRecipientGenerator(new KeyTransRecipientInfoGenerator()
-                    {
-                        RecipientCert = cert,
-                        SubjectKeyIdentifier = (DerOctetString)SubjectKeyIdentifier.CreateSha1KeyIdentifier(publicKeyInfo).ToAsn1Object()
-                     }).Build(new CmsContentEncryptorBuilder(NistObjectIdentifiers.IdAes128Cbc)
-                        .Build())
+                    .AddRecipientGenerator(new CmsKeyTransRecipientInfoGenerator(cert, new Asn1KeyWrapper("RSA/None/OAEPwithSHA256andMGF1Padding", cert)))
+                    .Build(new CmsContentEncryptorBuilder(NistObjectIdentifiers.IdAes128Cbc).Build())
             );
 
             var msg = certificateRequestMessageBuilder.Build();