From 97fe547649f05d509a9044a95d4be99f67d21a4e Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 11 Nov 2022 14:33:17 +0100
Subject: [PATCH 1/4] Bump PGPainless to 1.3.12

---
 .../pgpainless/certificate_store/KeyMaterialReader.java  | 9 +++++++--
 version.gradle                                           | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/KeyMaterialReader.java b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/KeyMaterialReader.java
index 112bf18..8ba3b9d 100644
--- a/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/KeyMaterialReader.java
+++ b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/KeyMaterialReader.java
@@ -23,8 +23,13 @@ public class KeyMaterialReader implements KeyMaterialReaderBackend {
         try {
             keyMaterial = PGPainless.readKeyRing().keyRing(data);
         } catch (IOException e) {
-            if (e.getMessage().contains("unknown object in stream") ||
-                    e.getMessage().contains("unexpected end of file in armored stream.")) {
+            String msg = e.getMessage();
+            if (msg == null) {
+                throw e;
+            }
+            if (msg.contains("unknown object in stream") ||
+                    msg.contains("unexpected end of file in armored stream.") ||
+                    msg.contains("invalid header encountered")) {
                 throw new BadDataException();
             } else {
                 throw e;
diff --git a/version.gradle b/version.gradle
index 024bca2..4425a52 100644
--- a/version.gradle
+++ b/version.gradle
@@ -12,7 +12,7 @@ allprojects {
         logbackVersion = '1.2.11'
         junitVersion = '5.8.2'
         mockitoVersion = '4.5.1'
-        pgpainlessVersion = '1.3.5'
+        pgpainlessVersion = '1.3.12'
         pgpCertDJavaVersion = '0.2.1'
         picocliVersion = '4.6.3'
     }

From 3ded66c3399ccb1cabcb55cfa79542cde5633220 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 11 Nov 2022 14:35:43 +0100
Subject: [PATCH 2/4] Update CHANGELOG

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 787c372..33dfca5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ SPDX-License-Identifier: CC0-1.0
 
 # Cert-D-PGPainless Changelog
 
+# 0.2.1-SNAPSHOT
+- Bump `pgpainless-core` to `1.3.12`
+
 ## 0.2.0
 - `get`: Apply `toLowerCase()` to fingerprints
 - Use BCs `PGPPublicKeyRing.join(first, second)` method to properly merge certificates

From dd0a56147d3e3aaa645bddf322a970d2cca6e602 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 11 Nov 2022 14:37:47 +0100
Subject: [PATCH 3/4] Cert-D-PGPainless 0.2.1

---
 CHANGELOG.md   | 2 +-
 version.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33dfca5..848e1df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ SPDX-License-Identifier: CC0-1.0
 
 # Cert-D-PGPainless Changelog
 
-# 0.2.1-SNAPSHOT
+# 0.2.1
 - Bump `pgpainless-core` to `1.3.12`
 
 ## 0.2.0
diff --git a/version.gradle b/version.gradle
index 4425a52..2d7355f 100644
--- a/version.gradle
+++ b/version.gradle
@@ -5,7 +5,7 @@
 allprojects {
     ext {
         shortVersion = '0.2.1'
-        isSnapshot = true
+        isSnapshot = false
         minAndroidSdk = 10
         javaSourceCompatibility = 1.8
         slf4jVersion = '1.7.36'

From 9c61b6353f1f813484be73cc23fed35315cda807 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Fri, 11 Nov 2022 14:49:58 +0100
Subject: [PATCH 4/4] Cert-D-PGPainless 0.2.2-SNAPSHOT

---
 version.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.gradle b/version.gradle
index 2d7355f..4466a99 100644
--- a/version.gradle
+++ b/version.gradle
@@ -4,8 +4,8 @@
 
 allprojects {
     ext {
-        shortVersion = '0.2.1'
-        isSnapshot = false
+        shortVersion = '0.2.2'
+        isSnapshot = true
         minAndroidSdk = 10
         javaSourceCompatibility = 1.8
         slf4jVersion = '1.7.36'