From 750fc595961ed2fb325fa56e1918ccb2eff5130e Mon Sep 17 00:00:00 2001 From: David Hook Date: Wed, 21 Oct 2015 10:43:24 +1100 Subject: Renamed DoFinal to Value on IBlockResult. --- crypto/src/crypto/operators/Asn1Signature.cs | 6 +++--- crypto/src/ocsp/BasicOCSPRespGenerator.cs | 2 +- crypto/src/pkcs/Pkcs10CertificationRequest.cs | 2 +- crypto/src/x509/X509V1CertificateGenerator.cs | 2 +- crypto/src/x509/X509V2AttributeCertificateGenerator.cs | 2 +- crypto/src/x509/X509V2CRLGenerator.cs | 2 +- crypto/src/x509/X509V3CertificateGenerator.cs | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'crypto') diff --git a/crypto/src/crypto/operators/Asn1Signature.cs b/crypto/src/crypto/operators/Asn1Signature.cs index ba070f4fc..c762f47e9 100644 --- a/crypto/src/crypto/operators/Asn1Signature.cs +++ b/crypto/src/crypto/operators/Asn1Signature.cs @@ -422,14 +422,14 @@ namespace Org.BouncyCastle.Crypto.Operators this.sig = sig; } - public byte[] DoFinal() + public byte[] Value() { return sig.GenerateSignature(); } - public int DoFinal(byte[] destination, int offset) + public int Value(byte[] destination, int offset) { - byte[] signature = DoFinal(); + byte[] signature = Value(); Array.Copy(signature, 0, destination, offset, signature.Length); diff --git a/crypto/src/ocsp/BasicOCSPRespGenerator.cs b/crypto/src/ocsp/BasicOCSPRespGenerator.cs index a7d5f3da5..32b17c2dd 100644 --- a/crypto/src/ocsp/BasicOCSPRespGenerator.cs +++ b/crypto/src/ocsp/BasicOCSPRespGenerator.cs @@ -219,7 +219,7 @@ namespace Org.BouncyCastle.Ocsp streamCalculator.Stream.Close(); - bitSig = new DerBitString(((IBlockResult)streamCalculator.GetResult()).DoFinal()); + bitSig = new DerBitString(((IBlockResult)streamCalculator.GetResult()).Value()); } catch (Exception e) { diff --git a/crypto/src/pkcs/Pkcs10CertificationRequest.cs b/crypto/src/pkcs/Pkcs10CertificationRequest.cs index b68979cad..255f04177 100644 --- a/crypto/src/pkcs/Pkcs10CertificationRequest.cs +++ b/crypto/src/pkcs/Pkcs10CertificationRequest.cs @@ -282,7 +282,7 @@ namespace Org.BouncyCastle.Pkcs streamCalculator.Stream.Close(); // Generate Signature. - sigBits = new DerBitString(((IBlockResult)streamCalculator.GetResult()).DoFinal()); + sigBits = new DerBitString(((IBlockResult)streamCalculator.GetResult()).Value()); } // internal Pkcs10CertificationRequest( diff --git a/crypto/src/x509/X509V1CertificateGenerator.cs b/crypto/src/x509/X509V1CertificateGenerator.cs index a452df440..3ca81b8ed 100644 --- a/crypto/src/x509/X509V1CertificateGenerator.cs +++ b/crypto/src/x509/X509V1CertificateGenerator.cs @@ -186,7 +186,7 @@ namespace Org.BouncyCastle.X509 streamCalculator.Stream.Close(); - return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).DoFinal()); + return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Value()); } private X509Certificate GenerateJcaObject( diff --git a/crypto/src/x509/X509V2AttributeCertificateGenerator.cs b/crypto/src/x509/X509V2AttributeCertificateGenerator.cs index 138f2ec6f..5f7d73708 100644 --- a/crypto/src/x509/X509V2AttributeCertificateGenerator.cs +++ b/crypto/src/x509/X509V2AttributeCertificateGenerator.cs @@ -180,7 +180,7 @@ namespace Org.BouncyCastle.X509 try { - v.Add(new DerBitString(((IBlockResult)streamCalculator.GetResult()).DoFinal())); + v.Add(new DerBitString(((IBlockResult)streamCalculator.GetResult()).Value())); return new X509V2AttributeCertificate(AttributeCertificate.GetInstance(new DerSequence(v))); } diff --git a/crypto/src/x509/X509V2CRLGenerator.cs b/crypto/src/x509/X509V2CRLGenerator.cs index c1cc8e824..97db6c9a0 100644 --- a/crypto/src/x509/X509V2CRLGenerator.cs +++ b/crypto/src/x509/X509V2CRLGenerator.cs @@ -243,7 +243,7 @@ namespace Org.BouncyCastle.X509 streamCalculator.Stream.Close(); - return GenerateJcaObject(tbsCertList, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).DoFinal()); + return GenerateJcaObject(tbsCertList, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Value()); } private TbsCertificateList GenerateCertList() diff --git a/crypto/src/x509/X509V3CertificateGenerator.cs b/crypto/src/x509/X509V3CertificateGenerator.cs index a22cd9943..bbd34bd35 100644 --- a/crypto/src/x509/X509V3CertificateGenerator.cs +++ b/crypto/src/x509/X509V3CertificateGenerator.cs @@ -322,7 +322,7 @@ namespace Org.BouncyCastle.X509 streamCalculator.Stream.Close (); - return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).DoFinal()); + return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Value()); } private X509Certificate GenerateJcaObject( -- cgit 1.4.1