diff options
| -rw-r--r-- | crypto/src/cms/CMSSignedDataGenerator.cs | 2 | ||||
| -rw-r--r-- | crypto/src/crypto/IBlockResult.cs | 4 | ||||
| -rw-r--r-- | crypto/src/crypto/operators/Asn1Signature.cs | 6 | ||||
| -rw-r--r-- | crypto/src/ocsp/BasicOCSPRespGenerator.cs | 2 | ||||
| -rw-r--r-- | crypto/src/pkcs/Pkcs10CertificationRequest.cs | 2 | ||||
| -rw-r--r-- | crypto/src/x509/X509V1CertificateGenerator.cs | 2 | ||||
| -rw-r--r-- | crypto/src/x509/X509V2AttributeCertificateGenerator.cs | 2 | ||||
| -rw-r--r-- | crypto/src/x509/X509V2CRLGenerator.cs | 2 | ||||
| -rw-r--r-- | crypto/src/x509/X509V3CertificateGenerator.cs | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/crypto/src/cms/CMSSignedDataGenerator.cs b/crypto/src/cms/CMSSignedDataGenerator.cs index 789aa9145..f4720597d 100644 --- a/crypto/src/cms/CMSSignedDataGenerator.cs +++ b/crypto/src/cms/CMSSignedDataGenerator.cs @@ -174,7 +174,7 @@ namespace Org.BouncyCastle.Cms } sigStr.Close(); - byte[] sigBytes = ((IBlockResult)calculator.GetResult()).Value(); + byte[] sigBytes = ((IBlockResult)calculator.GetResult()).Collect(); Asn1Set unsignedAttr = null; if (unsAttr != null) diff --git a/crypto/src/crypto/IBlockResult.cs b/crypto/src/crypto/IBlockResult.cs index f2149d951..0f054fedc 100644 --- a/crypto/src/crypto/IBlockResult.cs +++ b/crypto/src/crypto/IBlockResult.cs @@ -11,7 +11,7 @@ namespace Org.BouncyCastle.Crypto /// Return the final result of the operation. /// </summary> /// <returns>A block of bytes, representing the result of an operation.</returns> - byte[] Value(); + byte[] Collect(); /// <summary> /// Store the final result of the operation by copying it into the destination array. @@ -19,6 +19,6 @@ namespace Org.BouncyCastle.Crypto /// <returns>The number of bytes copied into destination.</returns> /// <param name="destination">The byte array to copy the result into.</param> /// <param name="offset">The offset into destination to start copying the result at.</param> - int Value(byte[] destination, int offset); + int Collect(byte[] destination, int offset); } } diff --git a/crypto/src/crypto/operators/Asn1Signature.cs b/crypto/src/crypto/operators/Asn1Signature.cs index c762f47e9..9e66b6f0c 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[] Value() + public byte[] Collect() { return sig.GenerateSignature(); } - public int Value(byte[] destination, int offset) + public int Collect(byte[] destination, int offset) { - byte[] signature = Value(); + byte[] signature = Collect(); Array.Copy(signature, 0, destination, offset, signature.Length); diff --git a/crypto/src/ocsp/BasicOCSPRespGenerator.cs b/crypto/src/ocsp/BasicOCSPRespGenerator.cs index 32b17c2dd..9735ba177 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()).Value()); + bitSig = new DerBitString(((IBlockResult)streamCalculator.GetResult()).Collect()); } catch (Exception e) { diff --git a/crypto/src/pkcs/Pkcs10CertificationRequest.cs b/crypto/src/pkcs/Pkcs10CertificationRequest.cs index 255f04177..6c6b4c87d 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()).Value()); + sigBits = new DerBitString(((IBlockResult)streamCalculator.GetResult()).Collect()); } // internal Pkcs10CertificationRequest( diff --git a/crypto/src/x509/X509V1CertificateGenerator.cs b/crypto/src/x509/X509V1CertificateGenerator.cs index 3ca81b8ed..2279767e3 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()).Value()); + return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect()); } private X509Certificate GenerateJcaObject( diff --git a/crypto/src/x509/X509V2AttributeCertificateGenerator.cs b/crypto/src/x509/X509V2AttributeCertificateGenerator.cs index 5f7d73708..b6ab45c64 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()).Value())); + v.Add(new DerBitString(((IBlockResult)streamCalculator.GetResult()).Collect())); return new X509V2AttributeCertificate(AttributeCertificate.GetInstance(new DerSequence(v))); } diff --git a/crypto/src/x509/X509V2CRLGenerator.cs b/crypto/src/x509/X509V2CRLGenerator.cs index 97db6c9a0..869722219 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()).Value()); + return GenerateJcaObject(tbsCertList, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect()); } private TbsCertificateList GenerateCertList() diff --git a/crypto/src/x509/X509V3CertificateGenerator.cs b/crypto/src/x509/X509V3CertificateGenerator.cs index bbd34bd35..d8cdc7521 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()).Value()); + return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect()); } private X509Certificate GenerateJcaObject( |