Compare commits

..

No commits in common. "9c61b6353f1f813484be73cc23fed35315cda807" and "c8bf6c5f837b4d7b05abe628b01d270de5e857eb" have entirely different histories.

3 changed files with 4 additions and 12 deletions

View file

@ -5,9 +5,6 @@ SPDX-License-Identifier: CC0-1.0
# Cert-D-PGPainless Changelog
# 0.2.1
- 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

View file

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

View file

@ -4,7 +4,7 @@
allprojects {
ext {
shortVersion = '0.2.2'
shortVersion = '0.2.1'
isSnapshot = true
minAndroidSdk = 10
javaSourceCompatibility = 1.8
@ -12,7 +12,7 @@ allprojects {
logbackVersion = '1.2.11'
junitVersion = '5.8.2'
mockitoVersion = '4.5.1'
pgpainlessVersion = '1.3.12'
pgpainlessVersion = '1.3.5'
pgpCertDJavaVersion = '0.2.1'
picocliVersion = '4.6.3'
}