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

1 files changed, 4 insertions, 4 deletions

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);
 
     }
 }