Skip to content

Throw if chunk number exceeds max value #130

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
infeo merged 2 commits into from
Aug 18, 2026
Merged

Throw if chunk number exceeds max value #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
919f771
throw if chunk number exceeds max value
infeo Aug 15, 2026
c9bc307
fix tests
infeo Aug 17, 2026
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
1 change: 1 addition & 0 deletions src/main/java/org/cryptomator/cryptolib/v3/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ private Constants() {
static final int PAYLOAD_SIZE = 32 * 1024;
static final int GCM_TAG_SIZE = 16;
static final int CHUNK_SIZE = GCM_NONCE_SIZE + PAYLOAD_SIZE + GCM_TAG_SIZE;
static final long MAX_CHUNK_NUMBER = 4_294_967_294L;

}
7 changes: 7 additions & 0 deletions src/main/java/org/cryptomator/cryptolib/v3/FileContentCryptorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.cryptomator.cryptolib.v3.Constants.CHUNK_SIZE;
import static org.cryptomator.cryptolib.v3.Constants.GCM_NONCE_SIZE;
import static org.cryptomator.cryptolib.v3.Constants.GCM_TAG_SIZE;
import static org.cryptomator.cryptolib.v3.Constants.MAX_CHUNK_NUMBER;
import static org.cryptomator.cryptolib.v3.Constants.PAYLOAD_SIZE;

class FileContentCryptorImpl implements FileContentCryptor {
Expand Down Expand Up @@ -61,6 +62,9 @@ public void encryptChunk(ByteBuffer cleartextChunk, ByteBuffer ciphertextChunk,
if (ciphertextChunk.remaining() < CHUNK_SIZE) {
throw new IllegalArgumentException("Invalid ciphertext chunk size: " + ciphertextChunk.remaining() + ", must fit up to " + CHUNK_SIZE + " bytes.");
}
if (chunkNumber < 0 || chunkNumber > MAX_CHUNK_NUMBER) {
throw new IllegalArgumentException("Invalid chunk number: " + chunkNumber + "expected range [0, " + Constants.MAX_CHUNK_NUMBER + "]");
}
FileHeaderImpl headerImpl = FileHeaderImpl.cast(header);
encryptChunk(cleartextChunk, ciphertextChunk, chunkNumber, headerImpl.getNonce(), headerImpl.getContentKey());
}
Expand All @@ -85,6 +89,9 @@ public void decryptChunk(ByteBuffer ciphertextChunk, ByteBuffer cleartextChunk,
if (!authenticate) {
throw new UnsupportedOperationException("authenticate can not be false");
}
if ( chunkNumber < 0 || chunkNumber > MAX_CHUNK_NUMBER) {
throw new IllegalArgumentException("Invalid chunk number: " + chunkNumber + "expected range [0, " + Constants.MAX_CHUNK_NUMBER + "]");
}
FileHeaderImpl headerImpl = FileHeaderImpl.cast(header);
decryptChunk(ciphertextChunk, cleartextChunk, chunkNumber, headerImpl.getNonce(), headerImpl.getContentKey());
}
Expand Down
11 changes: 11 additions & 0 deletions src/test/java/org/cryptomator/cryptolib/v3/FileContentCryptorImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,17 @@ public void testEncryptChunkOfInvalidSize(int size) {
});
}

@DisplayName("encrypt chunk with invalid chunk number")
@ParameterizedTest(name = "chunk number: {0}")
@ValueSource(longs = {-1L, Constants.MAX_CHUNK_NUMBER + 1L})
public void testEncryptChunkWithInvalidNumber(long number) {
ByteBuffer cleartext = ByteBuffer.allocate(Constants.PAYLOAD_SIZE);

Assertions.assertThrows(IllegalArgumentException.class, () -> {
fileContentCryptor.encryptChunk(cleartext, number, header);
});
}

@Test
@DisplayName("encrypt chunk")
public void testChunkEncryption() {
Expand Down
Loading