Consolidated BtoA/AtoB invocations.

The OSUtil's BtoA() and AtoB() have been replaced with wrapper
methods in com.netscape.cmsutil.util.Utils to simplify transition
into Base64 codec from Apache Commons library.

Ticket #90

3 files changed, 22 insertions, 20 deletions

diff --git a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java b/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java
index 4f7de8f84..eaf6b98dd 100644
--- a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java
+++ b/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMRestClient.java
@@ -18,6 +18,7 @@ import com.netscape.cms.servlet.request.model.ArchivalRequestData;
 import com.netscape.cms.servlet.request.model.KeyRequestInfo;
 import com.netscape.cms.servlet.request.model.KeyRequestInfos;
 import com.netscape.cms.servlet.request.model.RecoveryRequestData;
+import com.netscape.cmsutil.util.Utils;
 
 public class DRMRestClient {
 
@@ -52,7 +53,7 @@ public class DRMRestClient {
     public KeyRequestInfo archiveSecurityData(byte[] encoded, String clientId, String dataType) {
         // create archival request
         ArchivalRequestData data = new ArchivalRequestData();
-        String req1 = com.netscape.osutil.OSUtil.BtoA(encoded);
+        String req1 = Utils.base64encode(encoded);
         data.setWrappedPrivateData(req1);
         data.setClientId(clientId);
         data.setDataType(dataType);
@@ -81,14 +82,14 @@ public class DRMRestClient {
         RecoveryRequestData data = new RecoveryRequestData();
         data.setKeyId(keyId);
         if (rpwd != null) {
-            data.setSessionWrappedPassphrase(com.netscape.osutil.OSUtil.BtoA(rpwd));
+            data.setSessionWrappedPassphrase(Utils.base64encode(rpwd));
         }
         if (rkey != null) {
-            data.setTransWrappedSessionKey(com.netscape.osutil.OSUtil.BtoA(rkey));
+            data.setTransWrappedSessionKey(Utils.base64encode(rkey));
         }
 
         if (nonceData != null) {
-            data.setNonceData(com.netscape.osutil.OSUtil.BtoA(nonceData));
+            data.setNonceData(Utils.base64encode(nonceData));
         }
 
         KeyRequestInfo info = keyRequestClient.recoverKey(data);
@@ -105,14 +106,14 @@ public class DRMRestClient {
         data.setKeyId(keyId);
         data.setRequestId(requestId);
         if (rkey != null) {
-            data.setTransWrappedSessionKey(com.netscape.osutil.OSUtil.BtoA(rkey));
+            data.setTransWrappedSessionKey(Utils.base64encode(rkey));
         }
         if (rpwd != null) {
-            data.setSessionWrappedPassphrase(com.netscape.osutil.OSUtil.BtoA(rpwd));
+            data.setSessionWrappedPassphrase(Utils.base64encode(rpwd));
         }
 
         if (nonceData != null) {
-            data.setNonceData(com.netscape.osutil.OSUtil.BtoA(nonceData));
+            data.setNonceData(Utils.base64encode(nonceData));
         }
 
         KeyData key = keyClient.retrieveKey(data);
diff --git a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java b/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
index fb2ef7799..368cb7282 100644
--- a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
+++ b/pki/base/kra/functional/src/com/netscape/cms/servlet/test/DRMTest.java
@@ -44,6 +44,7 @@ import com.netscape.cms.servlet.key.model.KeyDataInfo;
 import com.netscape.cms.servlet.request.KeyRequestResource;
 import com.netscape.cms.servlet.request.model.KeyRequestInfo;
 import com.netscape.cmsutil.crypto.CryptoUtil;
+import com.netscape.cmsutil.util.Utils;
 
 public class DRMTest {
 
@@ -261,17 +262,17 @@ public class DRMTest {
         keyData = client.retrieveKey(keyId, recoveryRequestId, null, wrappedRecoveryKey, ivps.getIV());
         wrappedRecoveredKey = keyData.getWrappedPrivateData();
 
-        ivps_server = new IVParameterSpec(com.netscape.osutil.OSUtil.AtoB(keyData.getNonceData()));
+        ivps_server = new IVParameterSpec(Utils.base64decode(keyData.getNonceData()));
         try {
             recoveredKey = CryptoUtil.unwrapUsingSymmetricKey(token, ivps_server, 
-                    com.netscape.osutil.OSUtil.AtoB(wrappedRecoveredKey),
+                    Utils.base64decode(wrappedRecoveredKey),
                     recoveryKey, EncryptionAlgorithm.DES3_CBC_PAD);
         } catch (Exception e) {
             log("Exception in unwrapping key: " + e.toString());
             e.printStackTrace();
         }
 
-        if (!recoveredKey.equals(com.netscape.osutil.OSUtil.BtoA(vek.getEncoded()))) {
+        if (!recoveredKey.equals(Utils.base64encode(vek.getEncoded()))) {
             log("Error: recovered and archived keys do not match!");
         } else {
             log("Success: recoverd and archived keys match!");
@@ -310,7 +311,7 @@ public class DRMTest {
             e.printStackTrace();
         }
 
-        if (recoveredKey == null || !recoveredKey.equals(com.netscape.osutil.OSUtil.BtoA(vek.getEncoded()))) {
+        if (recoveredKey == null || !recoveredKey.equals(Utils.base64encode(vek.getEncoded()))) {
             log("Error: recovered and archived keys do not match!");
         } else {
             log("Success: recovered and archived keys do match!");
@@ -373,12 +374,12 @@ public class DRMTest {
 
         keyData = client.retrieveKey(keyId, recoveryRequestId, null, wrappedRecoveryKey, ivps.getIV());
         wrappedRecoveredKey = keyData.getWrappedPrivateData();
-        ivps_server = new IVParameterSpec( com.netscape.osutil.OSUtil.AtoB(keyData.getNonceData()));
+        ivps_server = new IVParameterSpec( Utils.base64decode(keyData.getNonceData()));
         try {
             recoveredKey = CryptoUtil.unwrapUsingSymmetricKey(token, ivps_server, 
-                    com.netscape.osutil.OSUtil.AtoB(wrappedRecoveredKey),
+                    Utils.base64decode(wrappedRecoveredKey),
                     recoveryKey, EncryptionAlgorithm.DES3_CBC_PAD);
-            recoveredKey = new String(com.netscape.osutil.OSUtil.AtoB(recoveredKey), "UTF-8");
+            recoveredKey = new String(Utils.base64decode(recoveredKey), "UTF-8");
         } catch (Exception e) {
             log("Exception in unwrapping key: " + e.toString());
             e.printStackTrace();
@@ -405,7 +406,7 @@ public class DRMTest {
         wrappedRecoveredKey = keyData.getWrappedPrivateData();
         try {
             recoveredKey = CryptoUtil.unwrapUsingPassphrase(wrappedRecoveredKey, recoveryPassphrase);
-            recoveredKey = new String(com.netscape.osutil.OSUtil.AtoB(recoveredKey), "UTF-8");
+            recoveredKey = new String(Utils.base64decode(recoveredKey), "UTF-8");
         } catch (Exception e) {
             log("Error: cannot unwrap key using passphrase");
             e.printStackTrace();
@@ -434,7 +435,7 @@ public class DRMTest {
         wrappedRecoveredKey = keyData.getWrappedPrivateData();
         try {
             recoveredKey = CryptoUtil.unwrapUsingPassphrase(wrappedRecoveredKey, recoveryPassphrase);
-            recoveredKey = new String(com.netscape.osutil.OSUtil.AtoB(recoveredKey), "UTF-8");
+            recoveredKey = new String(Utils.base64decode(recoveredKey), "UTF-8");
         } catch (Exception e) {
             log("Error: Can't unwrap recovered key using passphrase");
             e.printStackTrace();
diff --git a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java b/pki/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java
index 0bf0134e0..604430b57 100644
--- a/pki/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java
+++ b/pki/base/kra/functional/src/com/netscape/cms/servlet/test/GeneratePKIArchiveOptions.java
@@ -36,7 +36,7 @@ import org.mozilla.jss.crypto.TokenException;
 import org.mozilla.jss.util.Password;
 
 import com.netscape.cmsutil.crypto.CryptoUtil;
-import com.netscape.osutil.OSUtil;
+import com.netscape.cmsutil.util.Utils;
 
 @SuppressWarnings("deprecation")
 public class GeneratePKIArchiveOptions {
@@ -168,7 +168,7 @@ public class GeneratePKIArchiveOptions {
 
         // used for wrapping to send data to DRM
         byte[] tcert = read(transport_file);
-        String transportCert = com.netscape.osutil.OSUtil.BtoA(tcert);
+        String transportCert = Utils.base64encode(tcert);
 
         // Initialize token
         try {
@@ -202,7 +202,7 @@ public class GeneratePKIArchiveOptions {
         if (!passphraseMode) {
             vek = CryptoUtil.generateKey(token, KeyGenAlgorithm.DES3);
             // store vek in file
-            write_file(OSUtil.BtoA(vek.getKeyData()), key_file);
+            write_file(Utils.base64encode(vek.getKeyData()), key_file);
         }
 
         byte[] encoded = null;
@@ -216,7 +216,7 @@ public class GeneratePKIArchiveOptions {
         }
         
         // write encoded to file
-        write_file(OSUtil.BtoA(encoded), out_file);
+        write_file(Utils.base64encode(encoded), out_file);
 
     }
 }