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.

1 files changed, 2 insertions, 8 deletions

diff --git a/base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java b/base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java
index ecf3b0398..56c6f4c6e 100644
--- a/base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java
+++ b/base/kra/src/org/dogtagpki/server/kra/rest/KeyService.java
@@ -19,7 +19,6 @@
 package org.dogtagpki.server.kra.rest;
 
 
-import java.io.IOException;
 import java.math.BigInteger;
 import java.net.URI;
 import java.util.ArrayList;
@@ -70,7 +69,6 @@ import com.netscape.certsrv.request.RequestId;
 import com.netscape.certsrv.request.RequestStatus;
 import com.netscape.cms.servlet.base.PKIService;
 import com.netscape.cms.servlet.key.KeyRequestDAO;
-import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.cmsutil.ldap.LDAPUtil;
 import com.netscape.cmsutil.util.Utils;
 
@@ -440,12 +438,8 @@ public class KeyService extends PKIService implements KeyResource {
         ret.setAlgorithm(rec.getAlgorithm());
         ret.setSize(rec.getKeySize());
         ret.setOwnerName(rec.getOwnerName());
-        if(rec.getPublicKeyData() != null && getPublicKey){
-            try {
-                ret.setPublicKey(CryptoUtil.base64Encode(rec.getPublicKeyData()));
-            } catch (IOException e) {
-                throw new EBaseException(e.getMessage());
-            }
+        if (rec.getPublicKeyData() != null && getPublicKey) {
+            ret.setPublicKey(rec.getPublicKeyData());
         }
 
         Path keyPath = KeyResource.class.getAnnotation(Path.class);