From 5939b747b0d9959027f12d6fbf521e9633e27b6b Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Mon, 14 Jul 2025 21:52:04 +0200 Subject: [PATCH] Replace consumeAsBytes(XXX) with consumeRemainingAsBytes() --- .../java/org/pgpainless/sop/fuzzing/AsciiArmorFuzzTest.java | 2 +- .../pgpainless/sop/fuzzing/EncryptedMessageFuzzingTest.java | 3 ++- .../java/org/pgpainless/sop/fuzzing/ParseCertFuzzTest.java | 2 +- .../org/pgpainless/sop/fuzzing/PublicKeyPacketFuzzTest.java | 2 +- .../org/pgpainless/sop/fuzzing/SecretKeyPacketFuzzTest.java | 2 +- .../java/org/pgpainless/sop/fuzzing/SignatureFuzzTest.java | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/AsciiArmorFuzzTest.java b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/AsciiArmorFuzzTest.java index 7f068506..ead6098a 100644 --- a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/AsciiArmorFuzzTest.java +++ b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/AsciiArmorFuzzTest.java @@ -22,7 +22,7 @@ public class AsciiArmorFuzzTest { maxDuration = "60s" ) public void armorAndDearmorData(FuzzedDataProvider data) throws IOException { - byte[] bytes = data.consumeBytes(1024); + byte[] bytes = data.consumeRemainingAsBytes(); byte[] armored = sop.armor().data(bytes).getBytes(); if (Arrays.areEqual(bytes, armored)) { diff --git a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/EncryptedMessageFuzzingTest.java b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/EncryptedMessageFuzzingTest.java index 4cc2daa0..5277cac2 100644 --- a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/EncryptedMessageFuzzingTest.java +++ b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/EncryptedMessageFuzzingTest.java @@ -10,6 +10,7 @@ import org.bouncycastle.util.encoders.Hex; import org.bouncycastle.util.io.Streams; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.pgpainless.exception.MissingDecryptionMethodException; import org.pgpainless.exception.ModificationDetectionException; import org.pgpainless.sop.SOPImpl; import sop.SOP; @@ -75,7 +76,7 @@ public class EncryptedMessageFuzzingTest { maxDuration = "60s" ) public void decryptFuzzedMessage(FuzzedDataProvider provider) { - byte[] ciphertext = provider.consumeBytes(8192); + byte[] ciphertext = provider.consumeRemainingAsBytes(); if (ciphertext.length == 0) { return; } diff --git a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/ParseCertFuzzTest.java b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/ParseCertFuzzTest.java index 39296126..97324535 100644 --- a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/ParseCertFuzzTest.java +++ b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/ParseCertFuzzTest.java @@ -22,7 +22,7 @@ public class ParseCertFuzzTest { @FuzzTest(maxDuration = "30s") public void parseOpenPGPCert(FuzzedDataProvider data) throws IOException { - byte[] certEncoding = data.consumeBytes(8192); + byte[] certEncoding = data.consumeRemainingAsBytes(); if (certEncoding.length == 0) { return; } diff --git a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/PublicKeyPacketFuzzTest.java b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/PublicKeyPacketFuzzTest.java index bbd7e662..a5f6acc3 100644 --- a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/PublicKeyPacketFuzzTest.java +++ b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/PublicKeyPacketFuzzTest.java @@ -20,7 +20,7 @@ public class PublicKeyPacketFuzzTest { @FuzzTest(maxDuration = "30m") public void parsePublicKeyPacket(FuzzedDataProvider provider) { - byte[] encoding = provider.consumeBytes(8192); + byte[] encoding = provider.consumeRemainingAsBytes(); if (encoding.length == 0) { return; } diff --git a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/SecretKeyPacketFuzzTest.java b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/SecretKeyPacketFuzzTest.java index 2d0e94b5..670050eb 100644 --- a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/SecretKeyPacketFuzzTest.java +++ b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/SecretKeyPacketFuzzTest.java @@ -20,7 +20,7 @@ public class SecretKeyPacketFuzzTest { @FuzzTest(maxDuration = "30m") public void parseSecretKeyPacket(FuzzedDataProvider provider) { - byte[] encoding = provider.consumeBytes(8192); + byte[] encoding = provider.consumeRemainingAsBytes(); if (encoding.length == 0) { return; } diff --git a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/SignatureFuzzTest.java b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/SignatureFuzzTest.java index 6d1be4a2..c13057b0 100644 --- a/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/SignatureFuzzTest.java +++ b/pgpainless-sop/src/test/java/org/pgpainless/sop/fuzzing/SignatureFuzzTest.java @@ -273,7 +273,7 @@ public class SignatureFuzzTest { maxDuration = "60s" ) public void verifyFuzzedSig(FuzzedDataProvider provider) throws IOException { - byte[] sig = provider.consumeBytes(1024); + byte[] sig = provider.consumeRemainingAsBytes(); if (sig.length == 0) { return; }