Updated TimeStampTokenGenerator

Author: mwcw

crypto/src/cms/SignerInfoGenerator.cs

@@ -58,6 +58,16 @@ internal void setAssociatedCertificate(X509Certificate certificate)
         {
             this.certificate = certificate;
         }
+
+        public SignerInfoGeneratorBuilder NewBuilder()
+        {
+            SignerInfoGeneratorBuilder builder = new SignerInfoGeneratorBuilder();
+            builder.WithSignedAttributeGenerator(signedGen);
+            builder.WithUnsignedAttributeGenerator(unsignedGen);
+            builder.SetDirectSignature(isDirectSignature);
+            return builder;
+        }
+
     }
 
     public class SignerInfoGeneratorBuilder
@@ -69,6 +79,7 @@ public class SignerInfoGeneratorBuilder
         public SignerInfoGeneratorBuilder()
         {
         }
+    
 
         /**
          * If the passed in flag is true, the signer signature will be based on the data, not

crypto/src/crypto/IDigestFactory.cs

@@ -2,12 +2,11 @@ namespace Org.BouncyCastle.Crypto
 {
     /// <summary>
     /// Base interface for operator factories that create stream-based digest calculators.
-    /// </summary>
-    /// <typeparam name="A">The algorithm details/parameter type for the digest factory.</typeparam>
-    public interface IDigestFactory<out A>
+    /// </summary>   
+    public interface IDigestFactory
 	{
 		/// <summary>The algorithm details object for calculators made by this factory.</summary>
-		A AlgorithmDetails { get ; }
+		object AlgorithmDetails { get ; }
 
 		/// <summary>Return the size of the digest associated with this factory.</summary>
 		/// <returns>The length of the digest produced by this calculators from this factory in bytes.</returns>
@@ -19,6 +18,6 @@ public interface IDigestFactory<out A>
 		/// and producing the digest block.
 		/// </summary>
 		/// <returns>A calculator producing an IBlockResult with the final digest in it.</returns>
-		IStreamCalculator<IBlockResult> CreateCalculator();
+		IStreamCalculator CreateCalculator();
 	}
 }

crypto/src/crypto/operators/DigestFactory.cs

@@ -0,0 +1,79 @@
+using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Asn1.Nist;
+using Org.BouncyCastle.Asn1.Oiw;
+using Org.BouncyCastle.Asn1.Pkcs;
+using Org.BouncyCastle.Asn1.X509;
+using Org.BouncyCastle.Crypto.Digests;
+using Org.BouncyCastle.Crypto.IO;
+using Org.BouncyCastle.Crypto.Paddings;
+using Org.BouncyCastle.Crypto.Tests;
+using Org.BouncyCastle.Security;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+namespace Org.BouncyCastle.Crypto.Operators
+{
+
+
+
+    public class DigestFactory : IDigestFactory
+    {
+
+        public static DigestFactory Get(DerObjectIdentifier oid)
+        {
+            return new DigestFactory(DigestUtilities.GetDigest(oid), oid);          
+        }
+
+        public static DigestFactory Get(String mechanism)
+        {
+            DerObjectIdentifier oid = DigestUtilities.GetObjectIdentifier(mechanism);
+            return new DigestFactory(DigestUtilities.GetDigest(oid), oid);
+        }
+
+
+        private IDigest digest;
+        private DerObjectIdentifier oid;
+
+        public DigestFactory(IDigest digest, DerObjectIdentifier oid)
+        {
+            this.digest = digest;
+            this.oid = oid;
+        }    
+
+        public object AlgorithmDetails => new AlgorithmIdentifier(oid);
+
+        public int DigestLength => digest.GetDigestSize();
+
+        public IStreamCalculator CreateCalculator() => new DfDigestStream(digest);
+        
+    }
+
+
+    internal class DfDigestStream : IStreamCalculator
+    {
+
+        private DigestSink stream;
+
+        public DfDigestStream(IDigest digest)
+        {          
+            stream = new DigestSink(digest);
+        }
+
+        public Stream Stream => stream;
+
+        public object GetResult()
+        {
+            byte[] result = new byte[stream.Digest.GetDigestSize()];
+            stream.Digest.DoFinal(result, 0);
+            return new SimpleBlockResult(result);
+        }
+      
+    }
+
+   
+
+}

crypto/src/tsp/TimeStampToken.cs

@@ -85,9 +85,17 @@ public TimeStampToken(
 
 				if (attr != null)
 				{
-					SigningCertificate signCert = SigningCertificate.GetInstance(attr.AttrValues[0]);
 
-					this.certID = new CertID(EssCertID.GetInstance(signCert.GetCerts()[0]));
+					if (attr.AttrValues[0] is SigningCertificateV2)
+					{
+						SigningCertificateV2 signCert = SigningCertificateV2.GetInstance(attr.AttrValues[0]);
+						this.certID = new CertID(EssCertIDv2.GetInstance(signCert.GetCerts()[0]));
+					}
+					else
+					{
+						SigningCertificate signCert = SigningCertificate.GetInstance(attr.AttrValues[0]);
+						this.certID = new CertID(EssCertID.GetInstance(signCert.GetCerts()[0]));
+					}
 				}
 				else
 				{