diff options
| author | David Hook <dgh@bouncycastle.org> | 2015-10-12 16:39:22 +1100 |
|---|---|---|
| committer | David Hook <dgh@bouncycastle.org> | 2015-10-12 16:39:22 +1100 |
| commit | 454a3299691ed04f7be1cf4866af2c3f90621fd2 (patch) | |
| tree | e4099ef725af5a7ff5f7e418bd91a9c6311a13c1 /crypto/src/x509 | |
| parent | Initial cut of signature generation operators. (diff) | |
| download | BouncyCastle.NET-ed25519-454a3299691ed04f7be1cf4866af2c3f90621fd2.tar.xz | |
Fixed generics
Diffstat (limited to 'crypto/src/x509')
| -rw-r--r-- | crypto/src/x509/X509V1CertificateGenerator.cs | 6 | ||||
| -rw-r--r-- | crypto/src/x509/X509V2AttributeCertificateGenerator.cs | 4 | ||||
| -rw-r--r-- | crypto/src/x509/X509V2CRLGenerator.cs | 6 | ||||
| -rw-r--r-- | crypto/src/x509/X509V3CertificateGenerator.cs | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/crypto/src/x509/X509V1CertificateGenerator.cs b/crypto/src/x509/X509V1CertificateGenerator.cs index 8201a66ec..0ab6f4b77 100644 --- a/crypto/src/x509/X509V1CertificateGenerator.cs +++ b/crypto/src/x509/X509V1CertificateGenerator.cs @@ -172,9 +172,9 @@ namespace Org.BouncyCastle.X509 /// </summary> /// <param name="signatureCalculator">A signature calculator with the necessary algorithm details.</param> /// <returns>An X509Certificate.</returns> - public X509Certificate Generate(ISignatureCalculator<AlgorithmIdentifier> signatureCalculator) + public X509Certificate Generate(ISignatureCalculator signatureCalculator) { - tbsGen.SetSignature (signatureCalculator.AlgorithmDetails); + tbsGen.SetSignature ((AlgorithmIdentifier)signatureCalculator.AlgorithmDetails); TbsCertificateStructure tbsCert = tbsGen.GenerateTbsCertificate(); @@ -186,7 +186,7 @@ namespace Org.BouncyCastle.X509 sigStream.Close (); - return GenerateJcaObject(tbsCert, signatureCalculator.AlgorithmDetails, signatureCalculator.Signature()); + return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, signatureCalculator.Signature()); } private X509Certificate GenerateJcaObject( diff --git a/crypto/src/x509/X509V2AttributeCertificateGenerator.cs b/crypto/src/x509/X509V2AttributeCertificateGenerator.cs index 1cbdbcfcb..33aa40c6e 100644 --- a/crypto/src/x509/X509V2AttributeCertificateGenerator.cs +++ b/crypto/src/x509/X509V2AttributeCertificateGenerator.cs @@ -157,7 +157,7 @@ namespace Org.BouncyCastle.X509 /// </summary> /// <param name="signatureCalculator">A signature calculator with the necessary algorithm details.</param> /// <returns>An IX509AttributeCertificate.</returns> - public IX509AttributeCertificate Generate(ISignatureCalculator<AlgorithmIdentifier> signatureCalculator) + public IX509AttributeCertificate Generate(ISignatureCalculator signatureCalculator) { if (!extGenerator.IsEmpty) { @@ -176,7 +176,7 @@ namespace Org.BouncyCastle.X509 Asn1EncodableVector v = new Asn1EncodableVector(); - v.Add(acInfo, signatureCalculator.AlgorithmDetails); + v.Add(acInfo, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails); try { diff --git a/crypto/src/x509/X509V2CRLGenerator.cs b/crypto/src/x509/X509V2CRLGenerator.cs index ef0464a82..c7295f5db 100644 --- a/crypto/src/x509/X509V2CRLGenerator.cs +++ b/crypto/src/x509/X509V2CRLGenerator.cs @@ -229,9 +229,9 @@ namespace Org.BouncyCastle.X509 /// </summary> /// <param name="signatureCalculator">A signature calculator with the necessary algorithm details.</param> /// <returns>An X509Crl.</returns> - public X509Crl Generate(ISignatureCalculator<AlgorithmIdentifier> signatureCalculator) + public X509Crl Generate(ISignatureCalculator signatureCalculator) { - tbsGen.SetSignature(signatureCalculator.AlgorithmDetails); + tbsGen.SetSignature((AlgorithmIdentifier)signatureCalculator.AlgorithmDetails); TbsCertificateList tbsCertList = GenerateCertList(); @@ -243,7 +243,7 @@ namespace Org.BouncyCastle.X509 sigStream.Close(); - return GenerateJcaObject(tbsCertList, signatureCalculator.AlgorithmDetails, signatureCalculator.Signature()); + return GenerateJcaObject(tbsCertList, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, signatureCalculator.Signature()); } private TbsCertificateList GenerateCertList() diff --git a/crypto/src/x509/X509V3CertificateGenerator.cs b/crypto/src/x509/X509V3CertificateGenerator.cs index 252b91aa4..f3bcea5f0 100644 --- a/crypto/src/x509/X509V3CertificateGenerator.cs +++ b/crypto/src/x509/X509V3CertificateGenerator.cs @@ -303,9 +303,9 @@ namespace Org.BouncyCastle.X509 /// </summary> /// <param name="signatureCalculator">A signature calculator with the necessary algorithm details.</param> /// <returns>An X509Certificate.</returns> - public X509Certificate Generate(ISignatureCalculator<AlgorithmIdentifier> signatureCalculator) + public X509Certificate Generate(ISignatureCalculator signatureCalculator) { - tbsGen.SetSignature (signatureCalculator.AlgorithmDetails); + tbsGen.SetSignature ((AlgorithmIdentifier)signatureCalculator.AlgorithmDetails); if (!extGenerator.IsEmpty) { @@ -322,7 +322,7 @@ namespace Org.BouncyCastle.X509 sigStream.Close (); - return GenerateJcaObject(tbsCert, signatureCalculator.AlgorithmDetails, signatureCalculator.Signature()); + return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, signatureCalculator.Signature()); } private X509Certificate GenerateJcaObject( |