diff --git a/crypto/src/crypto/IXof.cs b/crypto/src/crypto/IXof.cs
index 8cddb2870..c2d53ca87 100644
--- a/crypto/src/crypto/IXof.cs
+++ b/crypto/src/crypto/IXof.cs
@@ -16,7 +16,7 @@ namespace Org.BouncyCastle.Crypto
/// <param name="outOff">offset to start writing the bytes at.</param>
/// <param name="outLen">the number of output bytes requested.</param>
/// <returns>the number of bytes written</returns>
- int DoFinal(byte[] output, int outOff, int outLen);
+ int OutputFinal(byte[] output, int outOff, int outLen);
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
/// <summary>
@@ -35,7 +35,7 @@ namespace Org.BouncyCastle.Crypto
/// <param name="outOff">offset to start writing the bytes at.</param>
/// <param name="outLen">the number of output bytes requested.</param>
/// <returns>the number of bytes written</returns>
- int DoOutput(byte[] output, int outOff, int outLen);
+ int Output(byte[] output, int outOff, int outLen);
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
/// <summary>
diff --git a/crypto/src/crypto/digests/Blake2xsDigest.cs b/crypto/src/crypto/digests/Blake2xsDigest.cs
index 43bfbac18..ac7e8f611 100644
--- a/crypto/src/crypto/digests/Blake2xsDigest.cs
+++ b/crypto/src/crypto/digests/Blake2xsDigest.cs
@@ -223,7 +223,7 @@ namespace Org.BouncyCastle.Crypto.Digests
*/
public int DoFinal(byte[] output, int outOff)
{
- return DoFinal(output, outOff, digestLength);
+ return OutputFinal(output, outOff, digestLength);
}
/**
@@ -234,9 +234,9 @@ namespace Org.BouncyCastle.Crypto.Digests
* @param outOff offset to start writing the bytes at.
* @param outLen the number of output bytes requested.
*/
- public int DoFinal(byte[] output, int outOff, int outLen)
+ public int OutputFinal(byte[] output, int outOff, int outLen)
{
- int ret = DoOutput(output, outOff, outLen);
+ int ret = Output(output, outOff, outLen);
Reset();
@@ -252,7 +252,7 @@ namespace Org.BouncyCastle.Crypto.Digests
* @param outLen the number of output bytes requested.
* @return the number of bytes written
*/
- public int DoOutput(byte[] output, int outOff, int outLen)
+ public int Output(byte[] output, int outOff, int outLen)
{
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
return Output(output.AsSpan(outOff, outLen));
diff --git a/crypto/src/crypto/digests/Blake3Digest.cs b/crypto/src/crypto/digests/Blake3Digest.cs
index 3b85c8c24..720af805d 100644
--- a/crypto/src/crypto/digests/Blake3Digest.cs
+++ b/crypto/src/crypto/digests/Blake3Digest.cs
@@ -468,11 +468,11 @@ namespace Org.BouncyCastle.Crypto.Digests
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
return OutputFinal(pOutput.AsSpan(pOutOffset, GetDigestSize()));
#else
- return DoFinal(pOutput, pOutOffset, GetDigestSize());
+ return OutputFinal(pOutput, pOutOffset, GetDigestSize());
#endif
}
- public int DoFinal(byte[] pOut, int pOutOffset, int pOutLen)
+ public int OutputFinal(byte[] pOut, int pOutOffset, int pOutLen)
{
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
return OutputFinal(pOut.AsSpan(pOutOffset, pOutLen));
@@ -482,7 +482,7 @@ namespace Org.BouncyCastle.Crypto.Digests
throw new InvalidOperationException(ERR_OUTPUTTING);
/* Build the required output */
- int length = DoOutput(pOut, pOutOffset, pOutLen);
+ int length = Output(pOut, pOutOffset, pOutLen);
/* reset the underlying digest and return the length */
Reset();
@@ -490,7 +490,7 @@ namespace Org.BouncyCastle.Crypto.Digests
#endif
}
- public int DoOutput(byte[] pOut, int pOutOffset, int pOutLen)
+ public int Output(byte[] pOut, int pOutOffset, int pOutLen)
{
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
return Output(pOut.AsSpan(pOutOffset, pOutLen));
diff --git a/crypto/src/crypto/digests/CSHAKEDigest.cs b/crypto/src/crypto/digests/CSHAKEDigest.cs
index fc37b865c..15a6c6da0 100644
--- a/crypto/src/crypto/digests/CSHAKEDigest.cs
+++ b/crypto/src/crypto/digests/CSHAKEDigest.cs
@@ -78,11 +78,11 @@ namespace Org.BouncyCastle.Crypto.Digests
get { return "CSHAKE" + fixedOutputLength; }
}
- public override int DoOutput(byte[] output, int outOff, int outLen)
+ public override int Output(byte[] output, int outOff, int outLen)
{
if (diff == null)
{
- return base.DoOutput(output, outOff, outLen);
+ return base.Output(output, outOff, outLen);
}
if (!squeezing)
diff --git a/crypto/src/crypto/digests/ParallelHash.cs b/crypto/src/crypto/digests/ParallelHash.cs
index 8054b2005..541d7f951 100644
--- a/crypto/src/crypto/digests/ParallelHash.cs
+++ b/crypto/src/crypto/digests/ParallelHash.cs
@@ -170,7 +170,7 @@ namespace Org.BouncyCastle.Crypto.Digests
private void Compress(byte[] buf, int offSet, int len)
{
compressor.BlockUpdate(buf, offSet, len);
- compressor.DoFinal(compressorBuffer, 0, compressorBuffer.Length);
+ compressor.OutputFinal(compressorBuffer, 0, compressorBuffer.Length);
cshake.BlockUpdate(compressorBuffer, 0, compressorBuffer.Length);
@@ -181,7 +181,7 @@ namespace Org.BouncyCastle.Crypto.Digests
private void Compress(ReadOnlySpan<byte> input, int pos, int len)
{
compressor.BlockUpdate(input.Slice(pos, len));
- compressor.DoFinal(compressorBuffer, 0, compressorBuffer.Length);
+ compressor.OutputFinal(compressorBuffer, 0, compressorBuffer.Length);
cshake.BlockUpdate(compressorBuffer, 0, compressorBuffer.Length);
@@ -234,14 +234,14 @@ namespace Org.BouncyCastle.Crypto.Digests
}
#endif
- public virtual int DoFinal(byte[] outBuf, int outOff, int outLen)
+ public virtual int OutputFinal(byte[] outBuf, int outOff, int outLen)
{
if (firstOutput)
{
WrapUp(outputLength);
}
- int rv = cshake.DoFinal(outBuf, outOff, outLen);
+ int rv = cshake.OutputFinal(outBuf, outOff, outLen);
Reset();
@@ -264,14 +264,14 @@ namespace Org.BouncyCastle.Crypto.Digests
}
#endif
- public virtual int DoOutput(byte[] outBuf, int outOff, int outLen)
+ public virtual int Output(byte[] outBuf, int outOff, int outLen)
{
if (firstOutput)
{
WrapUp(0);
}
- return cshake.DoOutput(outBuf, outOff, outLen);
+ return cshake.Output(outBuf, outOff, outLen);
}
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
diff --git a/crypto/src/crypto/digests/ShakeDigest.cs b/crypto/src/crypto/digests/ShakeDigest.cs
index 17d262261..f99d44de9 100644
--- a/crypto/src/crypto/digests/ShakeDigest.cs
+++ b/crypto/src/crypto/digests/ShakeDigest.cs
@@ -53,19 +53,19 @@ namespace Org.BouncyCastle.Crypto.Digests
public override int DoFinal(byte[] output, int outOff)
{
- return DoFinal(output, outOff, GetDigestSize());
+ return OutputFinal(output, outOff, GetDigestSize());
}
- public virtual int DoFinal(byte[] output, int outOff, int outLen)
+ public virtual int OutputFinal(byte[] output, int outOff, int outLen)
{
- int length = DoOutput(output, outOff, outLen);
+ int length = Output(output, outOff, outLen);
Reset();
return length;
}
- public virtual int DoOutput(byte[] output, int outOff, int outLen)
+ public virtual int Output(byte[] output, int outOff, int outLen)
{
if (!squeezing)
{
@@ -110,13 +110,13 @@ namespace Org.BouncyCastle.Crypto.Digests
*/
protected override int DoFinal(byte[] output, int outOff, byte partialByte, int partialBits)
{
- return DoFinal(output, outOff, GetDigestSize(), partialByte, partialBits);
+ return OutputFinal(output, outOff, GetDigestSize(), partialByte, partialBits);
}
/*
* TODO Possible API change to support partial-byte suffixes.
*/
- protected virtual int DoFinal(byte[] output, int outOff, int outLen, byte partialByte, int partialBits)
+ protected virtual int OutputFinal(byte[] output, int outOff, int outLen, byte partialByte, int partialBits)
{
if (partialBits < 0 || partialBits > 7)
throw new ArgumentException("must be in the range [0,7]", "partialBits");
diff --git a/crypto/src/crypto/digests/TupleHash.cs b/crypto/src/crypto/digests/TupleHash.cs
index 43030d5d5..a71ffb2c4 100644
--- a/crypto/src/crypto/digests/TupleHash.cs
+++ b/crypto/src/crypto/digests/TupleHash.cs
@@ -89,31 +89,31 @@ namespace Org.BouncyCastle.Crypto.Digests
public virtual int DoFinal(byte[] outBuf, int outOff)
{
- return DoFinal(outBuf, outOff, GetDigestSize());
+ return OutputFinal(outBuf, outOff, GetDigestSize());
}
- public virtual int DoFinal(byte[] outBuf, int outOff, int outLen)
+ public virtual int OutputFinal(byte[] outBuf, int outOff, int outLen)
{
if (firstOutput)
{
WrapUp(GetDigestSize());
}
- int rv = cshake.DoFinal(outBuf, outOff, outLen);
+ int rv = cshake.OutputFinal(outBuf, outOff, outLen);
Reset();
return rv;
}
- public virtual int DoOutput(byte[] outBuf, int outOff, int outLen)
+ public virtual int Output(byte[] outBuf, int outOff, int outLen)
{
if (firstOutput)
{
WrapUp(0);
}
- return cshake.DoOutput(outBuf, outOff, outLen);
+ return cshake.Output(outBuf, outOff, outLen);
}
public virtual void Reset()
diff --git a/crypto/src/crypto/encodings/OaepEncoding.cs b/crypto/src/crypto/encodings/OaepEncoding.cs
index af83a6f77..c151b7ac5 100644
--- a/crypto/src/crypto/encodings/OaepEncoding.cs
+++ b/crypto/src/crypto/encodings/OaepEncoding.cs
@@ -295,7 +295,7 @@ namespace Org.BouncyCastle.Crypto.Encodings
{
byte[] mask = new byte[length];
mgf1Hash.BlockUpdate(Z, zOff, zLen);
- ((IXof)mgf1Hash).DoFinal(mask, 0, mask.Length);
+ ((IXof)mgf1Hash).OutputFinal(mask, 0, mask.Length);
return mask;
}
diff --git a/crypto/src/crypto/macs/KMac.cs b/crypto/src/crypto/macs/KMac.cs
index ce6c9f701..4dd754765 100644
--- a/crypto/src/crypto/macs/KMac.cs
+++ b/crypto/src/crypto/macs/KMac.cs
@@ -61,7 +61,7 @@ namespace Org.BouncyCastle.Crypto.Macs
cshake.BlockUpdate(encOut, 0, encOut.Length);
}
- int rv = cshake.DoFinal(output, outOff, GetMacSize());
+ int rv = cshake.OutputFinal(output, outOff, GetMacSize());
Reset();
@@ -89,7 +89,7 @@ namespace Org.BouncyCastle.Crypto.Macs
}
#endif
- public int DoFinal(byte[] output, int outOff, int outLen)
+ public int OutputFinal(byte[] output, int outOff, int outLen)
{
if (firstOutput)
{
@@ -101,7 +101,7 @@ namespace Org.BouncyCastle.Crypto.Macs
cshake.BlockUpdate(encOut, 0, encOut.Length);
}
- int rv = cshake.DoFinal(output, outOff, outLen);
+ int rv = cshake.OutputFinal(output, outOff, outLen);
Reset();
@@ -129,7 +129,7 @@ namespace Org.BouncyCastle.Crypto.Macs
}
#endif
- public int DoOutput(byte[] output, int outOff, int outLen)
+ public int Output(byte[] output, int outOff, int outLen)
{
if (firstOutput)
{
@@ -143,7 +143,7 @@ namespace Org.BouncyCastle.Crypto.Macs
firstOutput = false;
}
- return cshake.DoOutput(output, outOff, outLen);
+ return cshake.Output(output, outOff, outLen);
}
#if NETCOREAPP2_1_OR_GREATER || NETSTANDARD2_1_OR_GREATER
diff --git a/crypto/src/crypto/signers/Ed448phSigner.cs b/crypto/src/crypto/signers/Ed448phSigner.cs
index 30d4a0aba..7ff9cfbbe 100644
--- a/crypto/src/crypto/signers/Ed448phSigner.cs
+++ b/crypto/src/crypto/signers/Ed448phSigner.cs
@@ -68,7 +68,7 @@ namespace Org.BouncyCastle.Crypto.Signers
throw new InvalidOperationException("Ed448phSigner not initialised for signature generation.");
byte[] msg = new byte[Ed448.PrehashSize];
- if (Ed448.PrehashSize != prehash.DoFinal(msg, 0, Ed448.PrehashSize))
+ if (Ed448.PrehashSize != prehash.OutputFinal(msg, 0, Ed448.PrehashSize))
throw new InvalidOperationException("Prehash digest failed");
byte[] signature = new byte[Ed448PrivateKeyParameters.SignatureSize];
diff --git a/crypto/src/crypto/signers/PssSigner.cs b/crypto/src/crypto/signers/PssSigner.cs
index b033bb251..6d34e6edd 100644
--- a/crypto/src/crypto/signers/PssSigner.cs
+++ b/crypto/src/crypto/signers/PssSigner.cs
@@ -358,7 +358,7 @@ namespace Org.BouncyCastle.Crypto.Signers
{
byte[] mask = new byte[length];
mgfDigest.BlockUpdate(Z, zOff, zLen);
- ((IXof)mgfDigest).DoFinal(mask, 0, mask.Length);
+ ((IXof)mgfDigest).OutputFinal(mask, 0, mask.Length);
return mask;
}
|
