From c8bf6c5f837b4d7b05abe628b01d270de5e857eb Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 1 Sep 2022 11:38:56 +0200 Subject: [PATCH 01/10] Cert-D-PGPainless 0.2.1-SNAPSHOT --- version.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.gradle b/version.gradle index 44b08ac..024bca2 100644 --- a/version.gradle +++ b/version.gradle @@ -4,8 +4,8 @@ allprojects { ext { - shortVersion = '0.2.0' - isSnapshot = false + shortVersion = '0.2.1' + isSnapshot = true minAndroidSdk = 10 javaSourceCompatibility = 1.8 slf4jVersion = '1.7.36' From 97fe547649f05d509a9044a95d4be99f67d21a4e Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 11 Nov 2022 14:33:17 +0100 Subject: [PATCH 02/10] 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 Date: Fri, 11 Nov 2022 14:35:43 +0100 Subject: [PATCH 03/10] 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 Date: Fri, 11 Nov 2022 14:37:47 +0100 Subject: [PATCH 04/10] 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 Date: Fri, 11 Nov 2022 14:49:58 +0100 Subject: [PATCH 05/10] 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' From 3f4fddfa7b5047c753f8bde4596b4bf883144ceb Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 7 Jul 2023 12:09:47 +0200 Subject: [PATCH 06/10] Bump cert-d-java to 0.2.2 --- version.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle b/version.gradle index 4466a99..4c69907 100644 --- a/version.gradle +++ b/version.gradle @@ -13,7 +13,7 @@ allprojects { junitVersion = '5.8.2' mockitoVersion = '4.5.1' pgpainlessVersion = '1.3.12' - pgpCertDJavaVersion = '0.2.1' + pgpCertDJavaVersion = '0.2.2' picocliVersion = '4.6.3' } } From 5b44f91ffb809dc9891a2b2a07328eae79a8d65f Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 7 Jul 2023 12:10:18 +0200 Subject: [PATCH 07/10] Bump pgpainless-core to 1.5.6 --- .../src/main/java/pgp/cert_d/cli/commands/Import.java | 4 ---- version.gradle | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java index 5306d24..9e92e9f 100644 --- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java +++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java @@ -4,7 +4,6 @@ package pgp.cert_d.cli.commands; -import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.pgpainless.PGPainless; @@ -46,9 +45,6 @@ public class Import implements Runnable { } catch (BadDataException e) { LOGGER.error("Certificate contains bad data.", e); System.exit(-1); - } catch (PGPException e) { - LOGGER.error("PGP Exception.", e); - System.exit(-1); } } } diff --git a/version.gradle b/version.gradle index 4c69907..9d3c43f 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.12' + pgpainlessVersion = '1.5.6' pgpCertDJavaVersion = '0.2.2' picocliVersion = '4.6.3' } From 4001e4d6c74959528f8322b0032a7d626d67decf Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 7 Jul 2023 12:10:57 +0200 Subject: [PATCH 08/10] Update changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 848e1df..dd257fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,11 @@ SPDX-License-Identifier: CC0-1.0 # Cert-D-PGPainless Changelog -# 0.2.1 +## 0.2.2 +- Bump `pgpainless-core` to `1.5.6` +- Bump `cert-d-java` to `0.2.2` + +## 0.2.1 - Bump `pgpainless-core` to `1.3.12` ## 0.2.0 From 2050450c6e4dccddababa3b0e6eb5293392f1edc Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 7 Jul 2023 12:17:35 +0200 Subject: [PATCH 09/10] Cert-D-PGPainless 0.2.2 --- version.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.gradle b/version.gradle index 9d3c43f..95ba3ce 100644 --- a/version.gradle +++ b/version.gradle @@ -5,7 +5,7 @@ allprojects { ext { shortVersion = '0.2.2' - isSnapshot = true + isSnapshot = false minAndroidSdk = 10 javaSourceCompatibility = 1.8 slf4jVersion = '1.7.36' From f061b076dc93e0728b0c3ac920754b899ad15e27 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 7 Jul 2023 12:19:47 +0200 Subject: [PATCH 10/10] Cert-D-PGPainless 0.2.3-SNAPSHOT --- version.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.gradle b/version.gradle index 95ba3ce..beeb5c3 100644 --- a/version.gradle +++ b/version.gradle @@ -4,8 +4,8 @@ allprojects { ext { - shortVersion = '0.2.2' - isSnapshot = false + shortVersion = '0.2.3' + isSnapshot = true minAndroidSdk = 10 javaSourceCompatibility = 1.8 slf4jVersion = '1.7.36'