PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-26 06:12:06 +01:00
Code Issues Releases Wiki Activity

Disallow stripping of primary secret keys

Browse source
This commit is contained in:
Paul Schaub 2022-05-07 14:11:39 +02:00
parent 64a50266f1
commit 3e7e6df3f9
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pgpainless-core/src/main/java/org/pgpainless/key/util/KeyRingUtils.java
View file

@ -451,6 +451,11 @@ public final class KeyRingUtils {
public static PGPSecretKeyRing stripSecretKey(@Nonnull PGPSecretKeyRing secretKeys, public static PGPSecretKeyRing stripSecretKey(@Nonnull PGPSecretKeyRing secretKeys,
long secretKeyId) long secretKeyId)
throws IOException, PGPException { throws IOException, PGPException {
if (secretKeys.getPublicKey().getKeyID() == secretKeyId) {
throw new IllegalArgumentException("Bouncy Castle currently cannot deal with stripped secret primary keys.");
}
if (secretKeys.getSecretKey(secretKeyId) == null) { if (secretKeys.getSecretKey(secretKeyId) == null) {
throw new NoSuchElementException("PGPSecretKeyRing does not contain secret key " + Long.toHexString(secretKeyId)); throw new NoSuchElementException("PGPSecretKeyRing does not contain secret key " + Long.toHexString(secretKeyId));
} }