diff --git a/crypto/src/x509/X509V1CertificateGenerator.cs b/crypto/src/x509/X509V1CertificateGenerator.cs
index 92829eac3..a311d823a 100644
--- a/crypto/src/x509/X509V1CertificateGenerator.cs
+++ b/crypto/src/x509/X509V1CertificateGenerator.cs
@@ -170,15 +170,15 @@ namespace Org.BouncyCastle.X509
/// <summary>
/// Generate a new X509Certificate using the passed in SignatureCalculator.
/// </summary>
- /// <param name="signatureCalculator">A signature calculator with the necessary algorithm details.</param>
+ /// <param name="signatureCalculatorFactory">A signature calculator factory with the necessary algorithm details.</param>
/// <returns>An X509Certificate.</returns>
- public X509Certificate Generate(ISignatureCalculatorFactory signatureCalculator)
+ public X509Certificate Generate(ISignatureCalculatorFactory signatureCalculatorFactory)
{
- tbsGen.SetSignature ((AlgorithmIdentifier)signatureCalculator.AlgorithmDetails);
+ tbsGen.SetSignature ((AlgorithmIdentifier)signatureCalculatorFactory.AlgorithmDetails);
TbsCertificateStructure tbsCert = tbsGen.GenerateTbsCertificate();
- IStreamCalculator streamCalculator = signatureCalculator.CreateCalculator();
+ IStreamCalculator streamCalculator = signatureCalculatorFactory.CreateCalculator();
byte[] encoded = tbsCert.GetDerEncoded();
@@ -186,7 +186,7 @@ namespace Org.BouncyCastle.X509
streamCalculator.Stream.Close();
- return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());
+ return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculatorFactory.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());
}
private X509Certificate GenerateJcaObject(
diff --git a/crypto/src/x509/X509V2AttributeCertificateGenerator.cs b/crypto/src/x509/X509V2AttributeCertificateGenerator.cs
index 28db75d0f..195030554 100644
--- a/crypto/src/x509/X509V2AttributeCertificateGenerator.cs
+++ b/crypto/src/x509/X509V2AttributeCertificateGenerator.cs
@@ -155,9 +155,9 @@ namespace Org.BouncyCastle.X509
/// <summary>
/// Generate a new X.509 Attribute Certificate using the passed in SignatureCalculator.
/// </summary>
- /// <param name="signatureCalculator">A signature calculator with the necessary algorithm details.</param>
+ /// <param name="signatureCalculatorFactory">A signature calculator factory with the necessary algorithm details.</param>
/// <returns>An IX509AttributeCertificate.</returns>
- public IX509AttributeCertificate Generate(ISignatureCalculatorFactory signatureCalculator)
+ public IX509AttributeCertificate Generate(ISignatureCalculatorFactory signatureCalculatorFactory)
{
if (!extGenerator.IsEmpty)
{
@@ -168,7 +168,7 @@ namespace Org.BouncyCastle.X509
byte[] encoded = acInfo.GetDerEncoded();
- IStreamCalculator streamCalculator = signatureCalculator.CreateCalculator();
+ IStreamCalculator streamCalculator = signatureCalculatorFactory.CreateCalculator();
streamCalculator.Stream.Write(encoded, 0, encoded.Length);
@@ -176,7 +176,7 @@ namespace Org.BouncyCastle.X509
Asn1EncodableVector v = new Asn1EncodableVector();
- v.Add(acInfo, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails);
+ v.Add(acInfo, (AlgorithmIdentifier)signatureCalculatorFactory.AlgorithmDetails);
try
{
diff --git a/crypto/src/x509/X509V2CRLGenerator.cs b/crypto/src/x509/X509V2CRLGenerator.cs
index 4504d39a6..4cfd1b6d9 100644
--- a/crypto/src/x509/X509V2CRLGenerator.cs
+++ b/crypto/src/x509/X509V2CRLGenerator.cs
@@ -227,15 +227,15 @@ namespace Org.BouncyCastle.X509
/// <summary>
/// Generate a new X509Crl using the passed in SignatureCalculator.
/// </summary>
- /// <param name="signatureCalculator">A signature calculator with the necessary algorithm details.</param>
+ /// <param name="signatureCalculatorFactory">A signature calculator factory with the necessary algorithm details.</param>
/// <returns>An X509Crl.</returns>
- public X509Crl Generate(ISignatureCalculatorFactory signatureCalculator)
+ public X509Crl Generate(ISignatureCalculatorFactory signatureCalculatorFactory)
{
- tbsGen.SetSignature((AlgorithmIdentifier)signatureCalculator.AlgorithmDetails);
+ tbsGen.SetSignature((AlgorithmIdentifier)signatureCalculatorFactory.AlgorithmDetails);
TbsCertificateList tbsCertList = GenerateCertList();
- IStreamCalculator streamCalculator = signatureCalculator.CreateCalculator();
+ IStreamCalculator streamCalculator = signatureCalculatorFactory.CreateCalculator();
byte[] encoded = tbsCertList.GetDerEncoded();
@@ -243,7 +243,7 @@ namespace Org.BouncyCastle.X509
streamCalculator.Stream.Close();
- return GenerateJcaObject(tbsCertList, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());
+ return GenerateJcaObject(tbsCertList, (AlgorithmIdentifier)signatureCalculatorFactory.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());
}
private TbsCertificateList GenerateCertList()
diff --git a/crypto/src/x509/X509V3CertificateGenerator.cs b/crypto/src/x509/X509V3CertificateGenerator.cs
index b046838e8..f19016f84 100644
--- a/crypto/src/x509/X509V3CertificateGenerator.cs
+++ b/crypto/src/x509/X509V3CertificateGenerator.cs
@@ -301,11 +301,11 @@ namespace Org.BouncyCastle.X509
/// <summary>
/// Generate a new X509Certificate using the passed in SignatureCalculator.
/// </summary>
- /// <param name="signatureCalculator">A signature calculator with the necessary algorithm details.</param>
+ /// <param name="signatureCalculatorFactory">A signature calculator factory with the necessary algorithm details.</param>
/// <returns>An X509Certificate.</returns>
- public X509Certificate Generate(ISignatureCalculatorFactory signatureCalculator)
+ public X509Certificate Generate(ISignatureCalculatorFactory signatureCalculatorFactory)
{
- tbsGen.SetSignature ((AlgorithmIdentifier)signatureCalculator.AlgorithmDetails);
+ tbsGen.SetSignature ((AlgorithmIdentifier)signatureCalculatorFactory.AlgorithmDetails);
if (!extGenerator.IsEmpty)
{
@@ -314,7 +314,7 @@ namespace Org.BouncyCastle.X509
TbsCertificateStructure tbsCert = tbsGen.GenerateTbsCertificate();
- IStreamCalculator streamCalculator = signatureCalculator.CreateCalculator();
+ IStreamCalculator streamCalculator = signatureCalculatorFactory.CreateCalculator();
byte[] encoded = tbsCert.GetDerEncoded();
@@ -322,7 +322,7 @@ namespace Org.BouncyCastle.X509
streamCalculator.Stream.Close ();
- return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());
+ return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculatorFactory.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());
}
private X509Certificate GenerateJcaObject(
|
