PGPainless/cert-d-pgpainless
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/cert-d-pgpainless.git synced 2024-12-22 05:17:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bump PGPainless to 1.3.12

Browse source
This commit is contained in:
Paul Schaub 2022-11-11 14:33:17 +01:00
parent c8bf6c5f83
commit 97fe547649
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/KeyMaterialReader.java
View file

@ -23,8 +23,13 @@ public class KeyMaterialReader implements KeyMaterialReaderBackend {
try { try {
keyMaterial = PGPainless.readKeyRing().keyRing(data); keyMaterial = PGPainless.readKeyRing().keyRing(data);
} catch (IOException e) { } catch (IOException e) {
if (e.getMessage().contains("unknown object in stream") || String msg = e.getMessage();
e.getMessage().contains("unexpected end of file in armored stream.")) { 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(); throw new BadDataException();
} else { } else {
throw e; throw e;

2
version.gradle
View file

@ -12,7 +12,7 @@ allprojects {
logbackVersion = '1.2.11' logbackVersion = '1.2.11'
junitVersion = '5.8.2' junitVersion = '5.8.2'
mockitoVersion = '4.5.1' mockitoVersion = '4.5.1'
pgpainlessVersion = '1.3.5' pgpainlessVersion = '1.3.12'
pgpCertDJavaVersion = '0.2.1' pgpCertDJavaVersion = '0.2.1'
picocliVersion = '4.6.3' picocliVersion = '4.6.3'
} }