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, 5 insertions, 10 deletions

diff --git a/base/kra/functional/drmtest.py b/base/kra/functional/drmtest.py
index 4d65955f9..8653763c1 100644
--- a/base/kra/functional/drmtest.py
+++ b/base/kra/functional/drmtest.py
@@ -60,9 +60,8 @@ def print_key_info(key_info):
     if key_info.public_key is not None:
         print "Public key: "
         print
-        pub_key = str(key_info.public_key)
-        for i in range(0, len(pub_key), 64):
-            print pub_key[i:i+64]
+        pub_key = base64.encodestring(key_info.public_key)
+        print pub_key
 
 
 def print_key_data(key_data):
diff --git a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
index 1b96c1809..720bba2b9 100644
--- a/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
+++ b/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
@@ -693,7 +693,7 @@ public class DRMTest {
             }
 
             // Test 33: Verify the generated key pair.
-            if (isKeyPairValid(algs[i], keyData.getData(), Utils.base64decode(info.getPublicKey()))) {
+            if (isKeyPairValid(algs[i], keyData.getData(), info.getPublicKey())) {
                 log("The key pair generated using " + algs[i] + " algorithm is valid.");
             } else {
                 log("The key pair generated using " + algs[i] + " algorithm is invalid.");
@@ -750,12 +750,8 @@ public class DRMTest {
         log("Status:    " + keyInfo.getStatus());
         if (keyInfo.getPublicKey() != null) {
             log("Public Key: ");
-            String publicKey = keyInfo.getPublicKey();
-            int i = 0;
-            for (i = 0; i < publicKey.length() / 64; i++) {
-                log(publicKey.substring(i * 64, i * 64 + 64));
-            }
-            log(publicKey.substring(i * 64));
+            String publicKey = Utils.base64encode(keyInfo.getPublicKey());
+            log(publicKey);
         }
     }