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

Fix NPE when sop generate-key --with-key-password is used with multiple uids

Browse source 
Fixes #351
This commit is contained in:
Paul Schaub 2022-12-15 12:25:35 +01:00
parent 43a29729ad
commit 05ae631a12
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -5,6 +5,9 @@ SPDX-License-Identifier: CC0-1.0
# PGPainless Changelog # PGPainless Changelog
## 1.3.15-SNAPSHOT
- Fix crash in `sop generate-key --with-key-password` when more then one user-id is given
## 1.3.14 ## 1.3.14
- Bump `bcpg` to `1.72.3` - Bump `bcpg` to `1.72.3`
- Fix DSA key parameter check - Fix DSA key parameter check

3
pgpainless-sop/src/main/java/org/pgpainless/sop/GenerateKeyImpl.java
View file

@ -55,6 +55,7 @@ public class GenerateKeyImpl implements GenerateKey {
throw new SOPGPException.MissingArg("Missing user-id."); throw new SOPGPException.MissingArg("Missing user-id.");
} }
Passphrase passphraseCopy = new Passphrase(passphrase.getChars()); // generateKeyRing clears the original passphrase
PGPSecretKeyRing key; PGPSecretKeyRing key;
try { try {
key = PGPainless.generateKeyRing() key = PGPainless.generateKeyRing()
@ -64,7 +65,7 @@ public class GenerateKeyImpl implements GenerateKey {
SecretKeyRingEditorInterface editor = PGPainless.modifyKeyRing(key); SecretKeyRingEditorInterface editor = PGPainless.modifyKeyRing(key);
while (userIdIterator.hasNext()) { while (userIdIterator.hasNext()) {
editor.addUserId(userIdIterator.next(), SecretKeyRingProtector.unprotectedKeys()); editor.addUserId(userIdIterator.next(), SecretKeyRingProtector.unlockAnyKeyWith(passphraseCopy));
} }
key = editor.done(); key = editor.done();