Skip to content

Commit 063bb44

Browse files
author
gefeili
committed
refactor of processDecryption, remove AADProcessingBuffer.processDecryptBytes
1 parent 7da1e85 commit 063bb44

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

core/src/main/java/org/bouncycastle/crypto/engines/AEADBufferBaseEngine.java

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ protected interface AADProcessingBuffer
109109
{
110110
void processAADByte(byte input);
111111

112-
int processDecryptBytes(byte[] input, int inOff, int len, byte[] output, int outOff);
113-
114112
int getUpdateOutputSize(int len);
115113

116114
boolean isLengthWithinAvailableSpace(int len, int available);
@@ -149,12 +147,6 @@ public int getUpdateOutputSize(int len)
149147
// The -1 is to account for the lazy processing of a full buffer
150148
return Math.max(0, len) - 1;
151149
}
152-
153-
@Override
154-
public int processDecryptBytes(byte[] input, int inOff, int len, byte[] output, int outOff)
155-
{
156-
return processDecryption(input, inOff, len, output, outOff);
157-
}
158150
}
159151

160152
private class ImmediateAADProcessor
@@ -187,12 +179,6 @@ public boolean isLengthExceedingBlockSize(int len, int size)
187179
{
188180
return len >= size;
189181
}
190-
191-
@Override
192-
public int processDecryptBytes(byte[] input, int inOff, int len, byte[] output, int outOff)
193-
{
194-
return processDecryption(input, inOff, len, output, outOff);
195-
}
196182
}
197183

198184
protected interface AADOperator
@@ -525,7 +511,7 @@ protected int processEncDecBytes(byte[] input, int inOff, int len, byte[] output
525511
ensureSufficientOutputBuffer(output, outOff, resultLength);
526512
int originalInOff = inOff;
527513
int originalm_bufPos = m_bufPos;
528-
if ((inOff = processor.processDecryptBytes(input, inOff, len, output, outOff)) == -1)
514+
if ((inOff = processDecryption(input, inOff, len, output, outOff)) == -1)
529515
{
530516
return resultLength;
531517
}

0 commit comments

Comments
 (0)