PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2025-12-10 22:31:09 +01:00
Code Issues Releases Wiki Activity

Add tests for SOP

Browse source
This commit is contained in:
Paul Schaub 2021-01-23 01:17:30 +01:00
parent a43d57445c
commit 6b1a740b9e
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
7 changed files with 376 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
pgpainless-sop/src/main/java/org/pgpainless/sop/commands/Decrypt.java
View file

@ -15,6 +15,20 @@
*/
package org.pgpainless.sop.commands;
import static org.pgpainless.sop.Print.err_ln;
import static org.pgpainless.sop.SopKeyUtil.loadKeysFromFiles;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPPublicKeyRing;
import org.bouncycastle.openpgp.PGPSecretKeyRing;
@ -28,21 +42,6 @@ import org.pgpainless.decryption_verification.OpenPgpMetadata;
import org.pgpainless.key.OpenPgpV4Fingerprint;
import picocli.CommandLine;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import static org.pgpainless.sop.Print.err_ln;
import static org.pgpainless.sop.SopKeyUtil.loadKeysFromFiles;
@CommandLine.Command(name = "decrypt",
description = "Decrypt a message from standard input")
public class Decrypt implements Runnable {
@ -125,7 +124,7 @@ public class Decrypt implements Runnable {
try {
verifyWith.add(PGPainless.readKeyRing().publicKeyRing(new FileInputStream(f)));
} catch (IOException e) {
e.printStackTrace();
}
}
}
@ -152,7 +151,6 @@ public class Decrypt implements Runnable {
Streams.pipeAll(decryptionStream, System.out);
decryptionStream.close();
} catch (IOException e) {
e.printStackTrace();
return;
}
if (verifyOut == null) {
@ -178,10 +176,11 @@ public class Decrypt implements Runnable {
try {
verifyOut.createNewFile();
PrintStream verifyPrinter = new PrintStream(new FileOutputStream(verifyOut));
// CHECKSTYLE:OFF
verifyPrinter.println(sb.toString());
// CHECKSTYLE:ON
verifyPrinter.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}