diff options
Diffstat (limited to 'crypto/src/x509/X509V3CertificateGenerator.cs')
| -rw-r--r-- | crypto/src/x509/X509V3CertificateGenerator.cs | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/crypto/src/x509/X509V3CertificateGenerator.cs b/crypto/src/x509/X509V3CertificateGenerator.cs index d5c9ffe92..65e3c9177 100644 --- a/crypto/src/x509/X509V3CertificateGenerator.cs +++ b/crypto/src/x509/X509V3CertificateGenerator.cs @@ -290,17 +290,38 @@ namespace Org.BouncyCastle.X509 tbsGen.SetExtensions(extGenerator.Generate()); } - TbsCertificateStructure tbsCert = tbsGen.GenerateTbsCertificate(); + var tbsCertificate = tbsGen.GenerateTbsCertificate(); - IStreamCalculator<IBlockResult> streamCalculator = signatureFactory.CreateCalculator(); - using (var sigStream = streamCalculator.Stream) - { - tbsCert.EncodeTo(sigStream, Asn1Encodable.Der); - } + var signature = X509Utilities.GenerateSignature(signatureFactory, tbsCertificate); + + return new X509Certificate(new X509CertificateStructure(tbsCertificate, sigAlgID, signature)); + } + + /// <summary> + /// Generate a new <see cref="X509Certificate"/> using the provided <see cref="ISignatureFactory"/> and + /// containing altSignatureAlgorithm and altSignatureValue extensions based on the passed + /// <paramref name="altSignatureFactory"/>. + /// </summary> + /// <param name="signatureFactory">A <see cref="ISignatureFactory">signature factory</see> with the necessary + /// algorithm details.</param> + /// <param name="isCritical">Whether the 'alt' extensions should be marked critical.</param> + /// <param name="altSignatureFactory">A <see cref="ISignatureFactory">signature factory</see> used to create the + /// altSignatureAlgorithm and altSignatureValue extensions.</param> + /// <returns>An <see cref="X509Certificate"/>.</returns> + public X509Certificate Generate(ISignatureFactory signatureFactory, bool isCritical, + ISignatureFactory altSignatureFactory) + { + tbsGen.SetSignature(null); + + var altSigAlgID = (AlgorithmIdentifier)altSignatureFactory.AlgorithmDetails; + extGenerator.AddExtension(X509Extensions.AltSignatureAlgorithm, isCritical, altSigAlgID); + + tbsGen.SetExtensions(extGenerator.Generate()); - var signature = streamCalculator.GetResult().Collect(); + var altSignature = X509Utilities.GenerateSignature(altSignatureFactory, tbsGen.GeneratePreTbsCertificate()); + extGenerator.AddExtension(X509Extensions.AltSignatureValue, isCritical, altSignature); - return new X509Certificate(new X509CertificateStructure(tbsCert, sigAlgID, new DerBitString(signature))); + return Generate(signatureFactory); } /// <summary> |