From db58280db65b28e8b05fd01ee78026320a1c8c69 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Sat, 19 Feb 2022 17:07:56 +0100
Subject: [PATCH] Change default criticality of signature subpackets to mirror
 those of sequoia

---
 .../builder/RevocationSignatureBuilder.java   |  2 +-
 .../subpackets/BaseSignatureSubpackets.java   |  4 ++++
 .../subpackets/SignatureSubpackets.java       | 20 ++++++++++++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/builder/RevocationSignatureBuilder.java b/pgpainless-core/src/main/java/org/pgpainless/signature/builder/RevocationSignatureBuilder.java
index e2e9c0c0..3c2dcab9 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/signature/builder/RevocationSignatureBuilder.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/signature/builder/RevocationSignatureBuilder.java
@@ -19,7 +19,7 @@ public class RevocationSignatureBuilder extends AbstractSignatureBuilder<Revocat
 
     public RevocationSignatureBuilder(SignatureType signatureType, PGPSecretKey signingKey, SecretKeyRingProtector protector) throws PGPException {
         super(signatureType, signingKey, protector);
-        getHashedSubpackets().setRevocable(true, false);
+        getHashedSubpackets().setRevocable(false);
     }
 
     @Override
diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/BaseSignatureSubpackets.java b/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/BaseSignatureSubpackets.java
index 9e882d22..182917a0 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/BaseSignatureSubpackets.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/BaseSignatureSubpackets.java
@@ -82,10 +82,14 @@ public interface BaseSignatureSubpackets {
 
     BaseSignatureSubpackets clearIntendedRecipientFingerprints();
 
+    BaseSignatureSubpackets setExportable(boolean isExportable);
+
     BaseSignatureSubpackets setExportable(boolean isCritical, boolean isExportable);
 
     BaseSignatureSubpackets setExportable(@Nullable Exportable exportable);
 
+    BaseSignatureSubpackets setRevocable(boolean revocable);
+
     BaseSignatureSubpackets setRevocable(boolean isCritical, boolean isRevocable);
 
     BaseSignatureSubpackets setRevocable(@Nullable Revocable revocable);
diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/SignatureSubpackets.java b/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/SignatureSubpackets.java
index 73730fd3..6c0740c7 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/SignatureSubpackets.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/signature/subpackets/SignatureSubpackets.java
@@ -116,7 +116,7 @@ public class SignatureSubpackets
 
     @Override
     public SignatureSubpackets setIssuerKeyId(long keyId) {
-        return setIssuerKeyId(true, keyId);
+        return setIssuerKeyId(false, keyId);
     }
 
     @Override
@@ -303,7 +303,7 @@ public class SignatureSubpackets
 
     @Override
     public SignatureSubpackets setPreferredCompressionAlgorithms(Set<CompressionAlgorithm> algorithms) {
-        return setPreferredCompressionAlgorithms(true, algorithms);
+        return setPreferredCompressionAlgorithms(false, algorithms);
     }
 
     @Override
@@ -342,7 +342,7 @@ public class SignatureSubpackets
 
     @Override
     public SignatureSubpackets setPreferredSymmetricKeyAlgorithms(Set<SymmetricKeyAlgorithm> algorithms) {
-        return setPreferredSymmetricKeyAlgorithms(true, algorithms);
+        return setPreferredSymmetricKeyAlgorithms(false, algorithms);
     }
 
     @Override
@@ -381,7 +381,7 @@ public class SignatureSubpackets
 
     @Override
     public SignatureSubpackets setPreferredHashAlgorithms(Set<HashAlgorithm> algorithms) {
-        return setPreferredHashAlgorithms(true, algorithms);
+        return setPreferredHashAlgorithms(false, algorithms);
     }
 
     @Override
@@ -465,6 +465,11 @@ public class SignatureSubpackets
         return new ArrayList<>(intendedRecipientFingerprintList);
     }
 
+    @Override
+    public SignatureSubpackets setExportable(boolean exportable) {
+        return setExportable(true, exportable);
+    }
+
     @Override
     public SignatureSubpackets setExportable(boolean isCritical, boolean isExportable) {
         return setExportable(new Exportable(isCritical, isExportable));
@@ -480,6 +485,11 @@ public class SignatureSubpackets
         return exportable;
     }
 
+    @Override
+    public SignatureSubpackets setRevocable(boolean revocable) {
+        return setRevocable(true, revocable);
+    }
+
     @Override
     public SignatureSubpackets setRevocable(boolean isCritical, boolean isRevocable) {
         return setRevocable(new Revocable(isCritical, isRevocable));
@@ -530,7 +540,7 @@ public class SignatureSubpackets
 
     @Override
     public SignatureSubpackets setRevocationReason(RevocationAttributes revocationAttributes) {
-        return setRevocationReason(true, revocationAttributes);
+        return setRevocationReason(false, revocationAttributes);
     }
 
     @Override