PGPainless/sop-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/sop-java.git synced 2024-11-19 05:52:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix indirect parameter passing for change-key-password password arguments

Browse source 
Fixes https://github.com/pgpainless/pgpainless/issues/453
Thanks to @dkg for the report
This commit is contained in:
Paul Schaub 2024-10-31 13:21:52 +01:00
parent 5ea94233d8
commit 00925e6511
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -6,6 +6,9 @@ SPDX-License-Identifier: Apache-2.0
# Changelog
## 7.0.2-SNAPSHOT
- CLI `change-key-password`: Fix indirect parameter passing for new and old passwords (thanks to @dkg for the report)
## 7.0.1
- `decrypt`: Do not throw `NoSignature` exception (exit code 3) if `--verify-with` is provided, but `VERIFICATIONS` is empty.

18
sop-java-picocli/src/main/java/sop/cli/picocli/commands/ChangeKeyPasswordCmd.java
View file

@ -39,15 +39,17 @@ public class ChangeKeyPasswordCmd extends AbstractSopCmd {
changeKeyPassword.noArmor();
}
for (String oldKeyPassword : oldKeyPasswords) {
changeKeyPassword.oldKeyPassphrase(oldKeyPassword);
}
if (newKeyPassword != null) {
changeKeyPassword.newKeyPassphrase(newKeyPassword);
}
try {
for (String oldKeyPassword : oldKeyPasswords) {
String password = stringFromInputStream(getInput(oldKeyPassword));
changeKeyPassword.oldKeyPassphrase(password);
}
if (newKeyPassword != null) {
String password = stringFromInputStream(getInput(newKeyPassword));
changeKeyPassword.newKeyPassphrase(password);
}
changeKeyPassword.keys(System.in).writeTo(System.out);
} catch (IOException e) {
throw new RuntimeException(e);