Skip to content

Validate output buffer size #1019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonkatonica merged 1 commit into from
Dec 10, 2025
Merged

Validate output buffer size #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/ibm/crypto/plus/provider/AESCipher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ protected int engineDoFinal(byte[] input, int inputOffset, int inputLen, byte[]
checkCipherInitialized();

try {
int outputSize = engineGetOutputSize(inputLen);
if ((output == null) || ((output.length - outputOffset) < outputSize)) {
throw new ShortBufferException(
"Output buffer must be " + "(at least) " + outputSize + " bytes long");
}

if (use_z_fast_command) {
int encryptedData = engineUpdate(input, inputOffset, inputLen, output,
outputOffset);
Expand Down
16 changes: 10 additions & 6 deletions src/test/java/ibm/jceplus/junit/base/BaseTestAESInterop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import javax.crypto.spec.SecretKeySpec;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

Expand Down Expand Up @@ -175,23 +176,26 @@ public void testAES_OFB_NoPadding() throws Exception {

@Test
public void testAESShortBuffer() throws Exception {
doTestAESShortBuffer("AES", getProviderName());
doTestAESShortBuffer("AES", getInteropProviderName());
String msg = doTestAESShortBuffer("AES", getProviderName());
String interopMsg = doTestAESShortBuffer("AES", getInteropProviderName());
assertEquals(msg, interopMsg);
}

private void doTestAESShortBuffer(String algorithm, String providerA) throws Exception {
private String doTestAESShortBuffer(String algorithm, String providerA) throws Exception {
String msg = null;
try {
// Test AES Cipher
cpA = Cipher.getInstance(algorithm, getProviderName());
cpA = Cipher.getInstance(algorithm, providerA);

// Encrypt the plain text
cpA.init(Cipher.ENCRYPT_MODE, key);
byte[] cipherText = new byte[5];
cpA.doFinal(plainText, 0, plainText.length, cipherText);
fail("Expected ShortBufferException did not occur");
fail("Expected ShortBufferException did not occur for provider: " + providerA);
} catch (ShortBufferException ex) {
assertTrue(true);
msg = ex.getMessage();
}
return msg;
}

@Test
Expand Down