diff options
| author | Ade Lee <alee@redhat.com> | 2016-11-08 21:34:41 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2016-11-10 14:33:40 -0500 |
| commit | e461ddefe339a428d322a3c9348e3e9ce88cbcc8 (patch) | |
| tree | c3b4bf07c0d3989c123c4f97b81f45eb07a2d412 /base/java-tools/src/com | |
| parent | 62b84bcb8742b090f0c400d341ea7d7790443644 (diff) | |
| download | pki-e461ddefe339a428d322a3c9348e3e9ce88cbcc8.tar.gz pki-e461ddefe339a428d322a3c9348e3e9ce88cbcc8.tar.xz pki-e461ddefe339a428d322a3c9348e3e9ce88cbcc8.zip | |
Add field to KeyData to allow request to be returned when non-synchronous
If a retrieval is non-sychronous, we create a non-ephemeral recovery
request and return this Request ID to the client.
Diffstat (limited to 'base/java-tools/src/com')
| -rw-r--r-- | base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java | 18 |
1 files changed, 12 insertions, 6 deletions
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 555faa00d..5a2b77e50 100644 --- a/base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/key/KeyRetrieveCLI.java @@ -173,15 +173,21 @@ public class KeyRetrieveCLI extends CLI { } public void printKeyData(Key key) { - System.out.println(" Key Algorithm: " + key.getAlgorithm()); - System.out.println(" Key Size: " + key.getSize()); - System.out.println(" Nonce data: " + Utils.base64encode(key.getNonceData())); + if (key.getRequestId() != null) + System.out.println(" Recovery Request ID: " + key.getRequestId()); + if (key.getAlgorithm() != null) + System.out.println(" Key Algorithm: " + key.getAlgorithm()); + if (key.getSize() != null) + System.out.println(" Key Size: " + key.getSize()); + if (key.getNonceData() != null) + System.out.println(" Nonce data: " + Utils.base64encode(key.getNonceData())); if (clientEncryption) { - System.out.println(" Encrypted Data:" + Utils.base64encode(key.getEncryptedData())); - + if (key.getEncryptedData() != null) + System.out.println(" Encrypted Data:" + Utils.base64encode(key.getEncryptedData())); } else { - System.out.println(" Actual archived data: " + Utils.base64encode(key.getData())); + if (key.getData() != null) + System.out.println(" Actual archived data: " + Utils.base64encode(key.getData())); } if (key.getP12Data() != null) { |