2 files changed, 7 insertions, 7 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
index 79c8a7489..241b759ed 100644
--- a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
+++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
@@ -70,9 +70,9 @@ import org.mozilla.jss.pkix.primitive.Name;
 import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo;
 import org.mozilla.jss.util.Password;
 
-import com.netscape.certsrv.apps.CMS;
 import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.cmsutil.util.HMACDigest;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * A command-line utility used to generate a Certificate Request Message
@@ -372,7 +372,7 @@ public class CRMFPopClient {
             System.out.println("CRMFPopClient: key pair generated."); //key pair generated");
 
             // wrap private key
-            byte transport[] = CMS.AtoB(transportCert);
+            byte transport[] = Utils.base64decode(transportCert);
 
             X509Certificate tcert = manager.importCACertPackage(transport);
 
@@ -552,7 +552,7 @@ public class CRMFPopClient {
                 s1.addElement(crmfMsg);
                 byte encoded[] = ASN1Util.encode(s1);
 
-                String Req1 = CMS.BtoA(encoded);
+                String Req1 = Utils.base64encode(encoded);
 
                 if (REQ_OUT_FILE != null)
                 {
diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
index f3eac9ff4..cbe5f3f43 100644
--- a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
+++ b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
@@ -47,9 +47,9 @@ import org.mozilla.jss.pkix.primitive.Name;
 import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo;
 import org.mozilla.jss.util.Password;
 
-import com.netscape.certsrv.apps.CMS;
 import com.netscape.cmsutil.crypto.CryptoUtil;
 import com.netscape.cmsutil.util.HMACDigest;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Generates an ECC or RSA key pair in the security database, constructs a
@@ -278,9 +278,9 @@ public class PKCS10Client {
                 certRequest.encode(bos);
                 byte[] bb = bos.toByteArray();
 
-                System.out.println("PKCS10Client: calling BtoA().");
-                b64E = CMS.BtoA(bb);
-                System.out.println("PKCS10Client: BtoA() completes.");
+                System.out.println("PKCS10Client: calling Utils.b64encode.");
+                b64E = Utils.base64encode(bb);
+                System.out.println("PKCS10Client: b64encode completes.");
             } else { // "ec"
 
                 CryptoToken t = cm.getThreadToken();