mirror of
https://codeberg.org/PGPainless/cert-d-pgpainless.git
synced 2024-09-21 07:29:36 +02:00
Compare commits
No commits in common. "9c61b6353f1f813484be73cc23fed35315cda807" and "c8bf6c5f837b4d7b05abe628b01d270de5e857eb" have entirely different histories.
9c61b6353f
...
c8bf6c5f83
|
@ -5,9 +5,6 @@ SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
# Cert-D-PGPainless Changelog
|
# Cert-D-PGPainless Changelog
|
||||||
|
|
||||||
# 0.2.1
|
|
||||||
- Bump `pgpainless-core` to `1.3.12`
|
|
||||||
|
|
||||||
## 0.2.0
|
## 0.2.0
|
||||||
- `get`: Apply `toLowerCase()` to fingerprints
|
- `get`: Apply `toLowerCase()` to fingerprints
|
||||||
- Use BCs `PGPPublicKeyRing.join(first, second)` method to properly merge certificates
|
- Use BCs `PGPPublicKeyRing.join(first, second)` method to properly merge certificates
|
||||||
|
|
|
@ -23,13 +23,8 @@ public class KeyMaterialReader implements KeyMaterialReaderBackend {
|
||||||
try {
|
try {
|
||||||
keyMaterial = PGPainless.readKeyRing().keyRing(data);
|
keyMaterial = PGPainless.readKeyRing().keyRing(data);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
String msg = e.getMessage();
|
if (e.getMessage().contains("unknown object in stream") ||
|
||||||
if (msg == null) {
|
e.getMessage().contains("unexpected end of file in armored stream.")) {
|
||||||
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;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
ext {
|
ext {
|
||||||
shortVersion = '0.2.2'
|
shortVersion = '0.2.1'
|
||||||
isSnapshot = true
|
isSnapshot = true
|
||||||
minAndroidSdk = 10
|
minAndroidSdk = 10
|
||||||
javaSourceCompatibility = 1.8
|
javaSourceCompatibility = 1.8
|
||||||
|
@ -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.12'
|
pgpainlessVersion = '1.3.5'
|
||||||
pgpCertDJavaVersion = '0.2.1'
|
pgpCertDJavaVersion = '0.2.1'
|
||||||
picocliVersion = '4.6.3'
|
picocliVersion = '4.6.3'
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue