From e5ae09b79c4320edc3dce5b572991003b41eb916 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Mon, 6 Sep 2021 15:13:41 +0200
Subject: [PATCH] Change default compression algorithm from UNCOMPRESSED to ZIP

---
 .../src/main/java/org/pgpainless/policy/Policy.java         | 2 +-
 .../signature/OnePassSignatureBracketingTest.java           | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/policy/Policy.java b/pgpainless-core/src/main/java/org/pgpainless/policy/Policy.java
index 943cf2aa..f2e3280a 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/policy/Policy.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/policy/Policy.java
@@ -379,7 +379,7 @@ public final class Policy {
         }
 
         public static CompressionAlgorithmPolicy defaultCompressionAlgorithmPolicy() {
-            return new CompressionAlgorithmPolicy(CompressionAlgorithm.UNCOMPRESSED, Arrays.asList(
+            return new CompressionAlgorithmPolicy(CompressionAlgorithm.ZIP, Arrays.asList(
                     CompressionAlgorithm.UNCOMPRESSED,
                     CompressionAlgorithm.ZIP,
                     CompressionAlgorithm.BZIP2,
diff --git a/pgpainless-core/src/test/java/org/pgpainless/signature/OnePassSignatureBracketingTest.java b/pgpainless-core/src/test/java/org/pgpainless/signature/OnePassSignatureBracketingTest.java
index 4467113d..5317059b 100644
--- a/pgpainless-core/src/test/java/org/pgpainless/signature/OnePassSignatureBracketingTest.java
+++ b/pgpainless-core/src/test/java/org/pgpainless/signature/OnePassSignatureBracketingTest.java
@@ -26,6 +26,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 
+import org.bouncycastle.openpgp.PGPCompressedData;
 import org.bouncycastle.openpgp.PGPEncryptedData;
 import org.bouncycastle.openpgp.PGPEncryptedDataList;
 import org.bouncycastle.openpgp.PGPException;
@@ -115,6 +116,11 @@ public class OnePassSignatureBracketingTest {
             } else if (next instanceof PGPOnePassSignatureList) {
                 onePassSignatures = (PGPOnePassSignatureList) next;
                 continue outerloop;
+            } else if (next instanceof PGPCompressedData) {
+                PGPCompressedData compressed = (PGPCompressedData) next;
+                InputStream decompressor = compressed.getDataStream();
+                objectFactory = new PGPObjectFactory(decompressor, ImplementationFactory.getInstance().getKeyFingerprintCalculator());
+                continue outerloop;
             } else if (next instanceof PGPLiteralData) {
                 continue outerloop;
             } else if (next instanceof PGPSignatureList) {