Makes output of secrets consistent for all clients.

All the secrets/keys retrieved using the client API's using Java/python
clients will be of the type - byte array. This applies to output of the
retrieveKey method and the public key attribute of the KeyInfo object.

2 files changed, 27 insertions, 6 deletions

diff --git a/base/common/src/com/netscape/certsrv/key/KeyClient.java b/base/common/src/com/netscape/certsrv/key/KeyClient.java
index 262a33d8f..ade3765a9 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyClient.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyClient.java
@@ -725,7 +725,7 @@ public class KeyClient extends Client {
          * For RSA, JSS accepts key sizes that fall in this set of values:
          * {256 + (16 * n), where 0 <= n <= 1008
          *
-         * For DSA, JSS accepts key sizes 512, 768, 1024 only when there are no p,q,g params specified.
+         * For DSA, JSS accepts key sizes 512, 768, 1024 only, when there are no p,q,g params specified.
          */
         if (keyAlgorithm.equals(KeyRequestResource.RSA_ALGORITHM)) {
             if (keySize >= 256) {
diff --git a/base/common/src/com/netscape/certsrv/key/KeyInfo.java b/base/common/src/com/netscape/certsrv/key/KeyInfo.java
index 71a858e6b..204cac493 100644
--- a/base/common/src/com/netscape/certsrv/key/KeyInfo.java
+++ b/base/common/src/com/netscape/certsrv/key/KeyInfo.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import com.netscape.certsrv.dbs.keydb.KeyId;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * @author alee
@@ -55,7 +56,7 @@ public class KeyInfo {
     protected String ownerName;
 
     @XmlElement
-    protected String publicKey;
+    private String publicKey;
 
     public KeyInfo() {
         // required for JAXB (defaults)
@@ -129,11 +130,31 @@ public class KeyInfo {
         this.ownerName = ownerName;
     }
 
-    public String getPublicKey() {
-        return publicKey;
+    /**
+     * Converts the stored base64 encoded public key to a byte
+     * array and returns that value. Returns null, if public key is null.
+     *
+     * @return public key - as a byte array
+     */
+    public byte[] getPublicKey() {
+        if (publicKey != null) {
+            return Utils.base64decode(publicKey);
+        }
+        return null;
     }
 
-    public void setPublicKey(String publicKey) {
-        this.publicKey = publicKey;
+    /**
+     * Sets the binary data of the public key in a
+     * base64 encoded string format.
+     *
+     * @param publicKey - if null, getPublicKey returns null.
+     */
+    public void setPublicKey(byte[] publicKey) {
+        if (publicKey != null) {
+            this.publicKey = Utils.base64encode(publicKey);
+        } else {
+            this.publicKey = null;
+        }
     }
+
 }