Skip to content
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

Fix GCMShortBuffer test #367

Merged
merged 1 commit into from
Mar 12, 2024
Merged

Fix GCMShortBuffer test #367

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
40 changes: 22 additions & 18 deletions src/com/amazon/corretto/crypto/provider/AesGcmSpi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,17 +564,19 @@ protected void engineUpdateAAD(ByteBuffer byteBuffer) {
private int engineEncryptFinal(
byte[] input, final int inputOffset, int inputLen, final byte[] output, int outputOffset)
throws ShortBufferException {
try {
if (opMode != NATIVE_MODE_ENCRYPT) {
throw new IllegalStateException("Cipher not initialized for encryption");
}
if (input == null) {
input = EMPTY_ARRAY;
}
// The following failures should not trigger reset
if (opMode != NATIVE_MODE_ENCRYPT) {
throw new IllegalStateException("Cipher not initialized for encryption");
}
if (input == null) {
input = EMPTY_ARRAY;
}

checkOutputBuffer(inputLen, output, outputOffset, true);
checkArrayLimits(input, inputOffset, inputLen);
checkOutputBuffer(inputLen, output, outputOffset, true);
checkArrayLimits(input, inputOffset, inputLen);

// Any future success or failure should trigger reset
try {
final boolean clobbers =
Utils.outputClobbersInput(input, inputOffset, inputLen, output, outputOffset);

Expand Down Expand Up @@ -705,17 +707,19 @@ private int engineDecryptFinal(
byte[] output,
final int outputOffset)
throws AEADBadTagException, ShortBufferException {
try {
if (opMode != NATIVE_MODE_DECRYPT) {
throw new IllegalStateException("Cipher not initialized for decryption");
}
if (input == null) {
input = EMPTY_ARRAY;
}
// The following failures should not trigger reset
if (opMode != NATIVE_MODE_DECRYPT) {
throw new IllegalStateException("Cipher not initialized for decryption");
}
if (input == null) {
input = EMPTY_ARRAY;
}

checkOutputBuffer(inputLen, output, outputOffset, true);
checkArrayLimits(input, inputOffset, inputLen);
checkOutputBuffer(inputLen, output, outputOffset, true);
checkArrayLimits(input, inputOffset, inputLen);

// Any future failure (or success) should trigger reset
try {
final byte[] workingInputArray;
final int workingInputOffset;
final int workingInputLength;
Expand Down
69 changes: 69 additions & 0 deletions tst/com/amazon/corretto/crypto/provider/test/AesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
package com.amazon.corretto.crypto.provider.test;

import static com.amazon.corretto.crypto.provider.test.TestUtil.NATIVE_PROVIDER;
import static com.amazon.corretto.crypto.provider.test.TestUtil.assertArraysHexEquals;
import static com.amazon.corretto.crypto.provider.test.TestUtil.assertThrows;
import static com.amazon.corretto.crypto.provider.test.TestUtil.assumeMinimumVersion;
import static com.amazon.corretto.crypto.provider.test.TestUtil.sneakyConstruct;
Expand Down Expand Up @@ -1314,6 +1315,74 @@ public void unintCipherReturnsParameters() throws GeneralSecurityException {
assertFalse(Arrays.equals(new byte[12], iv));
}

@Test
public void shortBufferDoesNotResetDecrypt() throws GeneralSecurityException {
final GCMParameterSpec spec = new GCMParameterSpec(128, randomIV());
amznC.init(Cipher.ENCRYPT_MODE, key, spec);
final byte[] plaintext = new byte[32];
final byte[] ciphertext = amznC.doFinal(plaintext);

amznC.init(Cipher.DECRYPT_MODE, key, spec);
amznC.update(ciphertext, 0, 16);

assertThrows(ShortBufferException.class, () -> amznC.doFinal(ciphertext, 8, 8, new byte[4]));

assertArraysHexEquals(plaintext, amznC.doFinal(ciphertext, 16, ciphertext.length - 16));
}

@Test
public void arrayIndexDoesNotResetDecrypt() throws GeneralSecurityException {
final GCMParameterSpec spec = new GCMParameterSpec(128, randomIV());
amznC.init(Cipher.ENCRYPT_MODE, key, spec);
final byte[] plaintext = new byte[32];
final byte[] ciphertext = amznC.doFinal(plaintext);

amznC.init(Cipher.DECRYPT_MODE, key, spec);
amznC.update(ciphertext, 0, 16);

assertThrows(
ArrayIndexOutOfBoundsException.class,
() -> amznC.doFinal(ciphertext, 8, 8, new byte[32], 36));

assertArraysHexEquals(plaintext, amznC.doFinal(ciphertext, 16, ciphertext.length - 16));
}

@Test
public void shortBufferDoesNotResetEncrypt() throws Exception {
final GCMParameterSpec spec = new GCMParameterSpec(128, randomIV());
amznC.init(Cipher.ENCRYPT_MODE, key, spec);
final byte[] plaintext = new byte[32];
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
baos.write(amznC.update(plaintext, 0, 16));

assertThrows(ShortBufferException.class, () -> amznC.doFinal(plaintext, 16, 16, new byte[4]));
baos.write(amznC.doFinal(plaintext, 16, 16));
final byte[] ciphertext = baos.toByteArray();

amznC.init(Cipher.DECRYPT_MODE, key, spec);

assertArraysHexEquals(plaintext, amznC.doFinal(ciphertext));
}

@Test
public void arrayIndexDoesNotResetEncrypt() throws Exception {
final GCMParameterSpec spec = new GCMParameterSpec(128, randomIV());
amznC.init(Cipher.ENCRYPT_MODE, key, spec);
final byte[] plaintext = new byte[32];
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
baos.write(amznC.update(plaintext, 0, 16));

assertThrows(
ArrayIndexOutOfBoundsException.class,
() -> amznC.doFinal(plaintext, 16, 16, new byte[32], 36));
baos.write(amznC.doFinal(plaintext, 16, 16));
final byte[] ciphertext = baos.toByteArray();

amznC.init(Cipher.DECRYPT_MODE, key, spec);

assertArraysHexEquals(plaintext, amznC.doFinal(ciphertext));
}

private byte[] randomIV() {
return TestUtil.getRandomBytes(16);
}
Expand Down
Loading