Skip to content
Snippets Groups Projects
Commit 36a9806f authored by Jérôme Charaoui's avatar Jérôme Charaoui
Browse files

Update upstream source from tag 'upstream/1.3.14'

Update to upstream version '1.3.14'
with Debian dir e0ae33507ff0692f4091edbb6ae9a8183b0adc3c
parents f9fc07c4 02c7d0f0
No related branches found
No related tags found
No related merge requests found
......@@ -5,6 +5,11 @@ SPDX-License-Identifier: CC0-1.0
# PGPainless Changelog
## 1.3.14
- Bump `bcpg` to `1.72.3`
- Fix DSA key parameter check
- Use proper method to unlock private signing keys when creating detached signatures
## 1.3.13
- Bump `sop-java` to `4.0.7`
......
......@@ -191,7 +191,7 @@ repositories {
}
dependencies {
implementation 'org.pgpainless:pgpainless-core:1.3.13'
implementation 'org.pgpainless:pgpainless-core:1.3.14'
}
```
......
......@@ -359,8 +359,7 @@ public final class SigningOptions {
if (signingSecKey == null) {
throw new KeyException.MissingSecretKeyException(OpenPgpFingerprint.of(secretKey), signingPubKey.getKeyID());
}
PGPPrivateKey signingSubkey = signingSecKey.extractPrivateKey(
secretKeyDecryptor.getDecryptor(signingPubKey.getKeyID()));
PGPPrivateKey signingSubkey = UnlockSecretKey.unlockSecretKey(signingSecKey, secretKeyDecryptor);
Set<HashAlgorithm> hashAlgorithms = userId != null ? keyRingInfo.getPreferredHashAlgorithms(userId)
: keyRingInfo.getPreferredHashAlgorithms(signingPubKey.getKeyID());
HashAlgorithm hashAlgorithm = negotiateHashAlgorithm(hashAlgorithms, PGPainless.getPolicy());
......
......@@ -195,7 +195,7 @@ public class PublicKeyParameterValidationUtil {
}
// q > 160 bits
boolean qLarge = pQ.getLowestSetBit() > 160;
boolean qLarge = pQ.bitLength() > 160;
if (!qLarge) {
return false;
}
......
......@@ -23,7 +23,7 @@ To start using pgpainless-sop in your code, include the following lines in your
...
dependencies {
...
implementation "org.pgpainless:pgpainless-sop:1.3.13"
implementation "org.pgpainless:pgpainless-sop:1.3.14"
...
}
......@@ -34,7 +34,7 @@ dependencies {
<dependency>
<groupId>org.pgpainless</groupId>
<artifactId>pgpainless-sop</artifactId>
<version>1.3.13</version>
<version>1.3.14</version>
</dependency>
...
</dependencies>
......
......@@ -4,7 +4,7 @@
allprojects {
ext {
shortVersion = '1.3.13'
shortVersion = '1.3.14'
isSnapshot = false
pgpainlessMinAndroidSdk = 10
javaSourceCompatibility = 1.8
......@@ -13,7 +13,7 @@ allprojects {
// unfortunately we rely on 1.72.1 or 1.72.3 for a patch for https://github.com/bcgit/bc-java/issues/1257
// which is a bug we introduced with a PR against BC :/ oops
// When bouncyCastleVersion is 1.71, bouncyPgVersion can simply be set to 1.71 as well.
bouncyPgVersion = '1.72.1'
bouncyPgVersion = '1.72.3'
junitVersion = '5.8.2'
logbackVersion = '1.2.11'
mockitoVersion = '4.5.1'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment