Update BouncyCastle usage

DEVSIX-7701

Author: glenner003

itext/itext.publications/itext.publications.signing-examples.aws-kms-test/itext.publications.signing-examples.aws-kms-test.csproj

@@ -12,6 +12,7 @@
     <RootNamespace />
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

itext/itext.publications/itext.publications.signing-examples.simple-test/iText/SigningExamples/Simple/TestSignBCSimple.cs

@@ -22,7 +22,8 @@ public void TestSignSimpleRsa()
             char[] storePass = "test1234".ToCharArray();
             string storeAlias = "RSAkey";
 
-            Pkcs12Store pkcs12 = new Pkcs12Store(new FileStream(storePath, FileMode.Open, FileAccess.Read), storePass);
+            Pkcs12Store pkcs12 = new Pkcs12StoreBuilder().Build();
+            pkcs12.Load(new FileStream(storePath, FileMode.Open, FileAccess.Read), storePass);
             AsymmetricKeyParameter key = pkcs12.GetKey(storeAlias).Key;
             X509CertificateEntry[] chainEntries = pkcs12.GetCertificateChain(storeAlias);
             IX509Certificate[] chain = new IX509Certificate[chainEntries.Length];
@@ -48,7 +49,8 @@ public void TestSignSimpleDsa()
             char[] storePass = "test1234".ToCharArray();
             string storeAlias = "DSAkey";
 
-            Pkcs12Store pkcs12 = new Pkcs12Store(new FileStream(storePath, FileMode.Open, FileAccess.Read), storePass);
+            Pkcs12Store pkcs12 = new Pkcs12StoreBuilder().Build();
+            pkcs12.Load(new FileStream(storePath, FileMode.Open, FileAccess.Read), storePass);
             AsymmetricKeyParameter key = pkcs12.GetKey(storeAlias).Key;
             X509CertificateEntry[] chainEntries = pkcs12.GetCertificateChain(storeAlias);
             IX509Certificate[] chain = new IX509Certificate[chainEntries.Length];
@@ -74,7 +76,8 @@ public void TestSignSimpleECDsa()
             char[] storePass = "test1234".ToCharArray();
             string storeAlias = "ECDSAkey";
 
-            Pkcs12Store pkcs12 = new Pkcs12Store(new FileStream(storePath, FileMode.Open, FileAccess.Read), storePass);
+            Pkcs12Store pkcs12 = new Pkcs12StoreBuilder().Build();
+            pkcs12.Load(new FileStream(storePath, FileMode.Open, FileAccess.Read), storePass);
             AsymmetricKeyParameter key = pkcs12.GetKey(storeAlias).Key;
             X509CertificateEntry[] chainEntries = pkcs12.GetCertificateChain(storeAlias);
             IX509Certificate[] chain = new IX509Certificate[chainEntries.Length];
@@ -100,7 +103,8 @@ public void TestSignSimpleRsaSsaPss()
             char[] storePass = "test1234".ToCharArray();
             string storeAlias = "RSAkey";
 
-            Pkcs12Store pkcs12 = new Pkcs12Store(new FileStream(storePath, FileMode.Open, FileAccess.Read), storePass);
+            Pkcs12Store pkcs12 = new Pkcs12StoreBuilder().Build();
+            pkcs12.Load(new FileStream(storePath, FileMode.Open, FileAccess.Read), storePass);
             AsymmetricKeyParameter key = pkcs12.GetKey(storeAlias).Key;
             X509CertificateEntry[] chainEntries = pkcs12.GetCertificateChain(storeAlias);
             X509Certificate[] chain = new X509Certificate[chainEntries.Length];
@@ -125,7 +129,8 @@ public void TestSignSimpleDsaSha256()
             char[] storePass = "test1234".ToCharArray();
             string storeAlias = "DSAkey";
 
-            Pkcs12Store pkcs12 = new Pkcs12Store(new FileStream(storePath, FileMode.Open, FileAccess.Read), storePass);
+            Pkcs12Store pkcs12 = new Pkcs12StoreBuilder().Build();
+            pkcs12.Load(new FileStream(storePath, FileMode.Open, FileAccess.Read), storePass);
             AsymmetricKeyParameter key = pkcs12.GetKey(storeAlias).Key;
             X509CertificateEntry[] chainEntries = pkcs12.GetCertificateChain(storeAlias);
             X509Certificate[] chain = new X509Certificate[chainEntries.Length];

itext/itext.publications/itext.publications.signing-examples.simple/iText/SigningExamples/Simple/PrivateKeySignatureContainer.cs

@@ -7,6 +7,7 @@
 using Org.BouncyCastle.X509.Store;
 using System.Collections.Generic;
 using System.IO;
+using Org.BouncyCastle.Utilities.Collections;
 
 namespace iText.SigningExamples.Simple
 {
@@ -35,9 +36,8 @@ public byte[] Sign(Stream data)
                 .Build(new Asn1SignatureFactory(algorithm, key), chain[0]);
             gen.AddSignerInfoGenerator(signerInfoGenerator);
 
-            X509CollectionStoreParameters collectionStoreParameters = new X509CollectionStoreParameters(new List<X509Certificate>(chain));
-            IX509Store collectionStore = X509StoreFactory.Create("CERTIFICATE/COLLECTION", collectionStoreParameters);
-            gen.AddCertificates(collectionStore);
+            IStore<X509Certificate> store =CollectionUtilities.CreateStore( new List<X509Certificate>(chain));
+            gen.AddCertificates(store);
 
             CmsSignedData sigData = gen.Generate(msg, false);
             return sigData.GetEncoded();

itext/itext.samples/itext/samples/EncryptWithCertificateSampleTest.cs

@@ -62,7 +62,8 @@ private IPrivateKey GetPrivateKey()
         {
             using (FileStream stream = new FileStream(PRIVATE, FileMode.Open, FileAccess.Read))
             {
-                Pkcs12Store keyStore = new Pkcs12Store(stream, "kspass".ToCharArray());
+                Pkcs12Store keyStore = new Pkcs12StoreBuilder().Build();
+                keyStore.Load(stream, "kspass".ToCharArray());
                 return new PrivateKeyBC(keyStore.GetKey("sandbox").Key);
             }
         }

itext/itext.samples/itext/samples/sandbox/signatures/SignatureExample.cs

@@ -86,8 +86,8 @@ protected void SignDocumentSignature(string filePath, ElectronicSignatureInfoDTO
         private PrivateKeySignature GetPrivateKeySignature(String certificatePath, char[] password)
         {
             String alias = null;
-            Pkcs12Store pk12 =
-                new Pkcs12Store(new FileStream(certificatePath, FileMode.Open, FileAccess.Read), password);
+            Pkcs12Store pk12 = new Pkcs12StoreBuilder().Build();
+            pk12.Load(new FileStream(certificatePath, FileMode.Open, FileAccess.Read), password);
 
             foreach (var a in pk12.Aliases)
             {
@@ -107,8 +107,8 @@ private IX509Certificate[] GetCertificateChain(String certificatePath, char[] pa
         {
             IX509Certificate[] chain;
             String alias = null;
-            Pkcs12Store pk12 =
-                new Pkcs12Store(new FileStream(certificatePath, FileMode.Open, FileAccess.Read), password);
+            Pkcs12Store pk12 = new Pkcs12StoreBuilder().Build();
+            pk12.Load(new FileStream(certificatePath, FileMode.Open, FileAccess.Read), password);
 
             foreach (var a in pk12.Aliases)
             {