From a57b356352261d5288949afcdeda7665abba3ae3 Mon Sep 17 00:00:00 2001 From: Abhishek Koneru Date: Fri, 23 May 2014 10:58:26 -0400 Subject: Updated man page for pki key commands Updated man page for all the new CLI commands added for the Key and KeyRequest resources. Also added missing code to retrieve a secret wrapped in a user specified passphrase. Ticket #945 --- .../src/com/netscape/cmstools/key/KeyRetrieveCLI.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'base/java-tools/src') diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java index 98c243a82..5d882f7a6 100644 --- a/base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java @@ -135,14 +135,20 @@ public class KeyRetrieveCLI extends CLI { } } else { + // Using command line options. String keyId = cmd.getOptionValue("keyID"); - clientEncryption = false; + String passphrase = cmd.getOptionValue("passphrase"); try { - keyData = keyCLI.keyClient.retrieveKey(new KeyId(keyId)); + if (passphrase != null) { + keyData = keyCLI.keyClient.retrieveKeyByPassphrase(new KeyId(keyId), passphrase); + } else { + keyData = keyCLI.keyClient.retrieveKey(new KeyId(keyId)); + clientEncryption = false; - // No need to return the encrypted data since encryption - //is done locally. - keyData.setEncryptedData(null); + // No need to return the encrypted data since encryption + //is done locally. + keyData.setEncryptedData(null); + } } catch (Exception e) { System.err.println(e.getMessage()); if (verbose) -- cgit