From 05a616aa0d93725a7af19eda1bf603c446cb638c Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 11 Dec 2014 20:58:04 +0000 Subject: [PATCH] SU3File: Implement 'extract -k' --- core/java/src/net/i2p/crypto/SU3File.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/java/src/net/i2p/crypto/SU3File.java b/core/java/src/net/i2p/crypto/SU3File.java index 939187ac88..7f5ffa2e97 100644 --- a/core/java/src/net/i2p/crypto/SU3File.java +++ b/core/java/src/net/i2p/crypto/SU3File.java @@ -593,7 +593,7 @@ public class SU3File { } else if ("keygen".equals(cmd)) { ok = genKeysCLI(stype, a.get(0), a.get(1), a.get(2)); } else if ("extract".equals(cmd)) { - ok = extractCLI(a.get(0), a.get(1), shouldVerify); + ok = extractCLI(a.get(0), a.get(1), shouldVerify, kfile); } else { showUsageCLI(); } @@ -861,10 +861,12 @@ public class SU3File { * @return success * @since 0.9.9 */ - private static final boolean extractCLI(String signedFile, String outFile, boolean verifySig) { + private static final boolean extractCLI(String signedFile, String outFile, boolean verifySig, String pkFile) { InputStream in = null; try { SU3File file = new SU3File(signedFile); + if (pkFile != null) + file.setPublicKeyCertificate(new File(pkFile)); file.setVerifySignature(verifySig); File out = new File(outFile); boolean ok = file.verifyAndMigrate(out);