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

18 files changed, 64 insertions, 32 deletions

diff --git a/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java b/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java
index 691bc9b19..48301e492 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/AtoB.java
@@ -25,6 +25,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * The AtoB class is a utility program designed to "translate" an ASCII
  * BASE 64 encoded blob into a BINARY BASE 64 encoded blob. It assumes
@@ -113,7 +115,7 @@ public class AtoB {
         // (5) Decode the ASCII BASE 64 blob enclosed in the
         //     String() object into a BINARY BASE 64 byte[] object
 
-        binaryBASE64Blob = com.netscape.osutil.OSUtil.AtoB(asciiBASE64Blob);
+        binaryBASE64Blob = Utils.base64decode(asciiBASE64Blob);
 
         // (6) Finally, print the actual AtoB blob to the
         //     specified output file
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java b/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java
index 8a8854f8f..fb23e89fd 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/AuditVerify.java
@@ -36,6 +36,8 @@ import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.crypto.ObjectNotFoundException;
 import org.mozilla.jss.crypto.X509Certificate;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * Tool for verifying signed audit logs
  * 
@@ -52,7 +54,7 @@ public class AuditVerify {
     public static final String CRYPTO_PROVIDER = "Mozilla-JSS";
 
     public static byte[] base64decode(String input) throws Exception {
-        return com.netscape.osutil.OSUtil.AtoB(input);
+        return Utils.base64decode(input);
     }
 
     // We always sign 0x0a as the line separator, regardless of what
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java b/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java
index 3d281d0cc..4c2e5c22a 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/BtoA.java
@@ -22,6 +22,8 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * The BtoA class is a utility program designed to "translate" a BINARY
  * BASE 64 encoded blob into an ASCII BASE 64 encoded blob. It assumes
@@ -88,7 +90,7 @@ public class BtoA {
         try {
             byte data[] = new byte[inputBlob.available()];
             inputBlob.read(data);
-            String out = com.netscape.osutil.OSUtil.BtoA(data);
+            String out = Utils.base64encode(data);
             outputBlob.write(out.getBytes());
         } catch (IOException e) {
             System.out.println("BtoA():  Unexpected BASE64 " +
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
index d739fbcff..e2e51a29d 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
@@ -65,6 +65,8 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier;
 import org.mozilla.jss.pkix.primitive.Name;
 import org.mozilla.jss.util.Password;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * Tool for signing PKCS #10 , return CMC enrollment request
  * 
@@ -142,7 +144,7 @@ public class CMCEnroll {
             ContentInfo fullEnrollmentReq = null;
 
             try {
-                byte[] decodedBytes = com.netscape.osutil.OSUtil.AtoB(asciiBASE64Blob);
+                byte[] decodedBytes = Utils.base64decode(asciiBASE64Blob);
 
                 pkcs = new PKCS10(decodedBytes);
             } catch (IOException e) {
@@ -199,7 +201,7 @@ public class CMCEnroll {
                 dig = salt.getBytes();
             }
 
-            String sn = com.netscape.osutil.OSUtil.BtoA(dig);
+            String sn = Utils.base64encode(dig);
 
             TaggedAttribute senderNonce = new TaggedAttribute(new
                     INTEGER(bpid++),
@@ -287,7 +289,7 @@ public class CMCEnroll {
             ByteArrayOutputStream os = new ByteArrayOutputStream();
 
             fullEnrollmentReq.encode(os);
-            ps.print(com.netscape.osutil.OSUtil.BtoA(os.toByteArray()));
+            ps.print(Utils.base64encode(os.toByteArray()));
             //fullEnrollmentReq.print(ps); // no header/trailer
             asciiBASE64Blob = bs.toString();
         } catch (Exception e) {
@@ -423,7 +425,7 @@ public class CMCEnroll {
 
                 @SuppressWarnings("unused")
                 byte binaryBASE64Blob[] =
-                        com.netscape.osutil.OSUtil.AtoB(asciiBASE64Blob); // check for errors
+                        Utils.base64decode(asciiBASE64Blob); // check for errors
 
                 // (6) Finally, print the actual CMCEnroll blob to the
                 //     specified output file
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
index a4368736c..591361149 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
@@ -82,6 +82,7 @@ import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo;
 import org.mozilla.jss.util.Password;
 
 import com.netscape.cmsutil.util.HMACDigest;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Tool for creating CMC full request
@@ -184,7 +185,7 @@ public class CMCRequest {
             try {
                 for (int k = 0; k < rValue.length; k++) {
                     String asciiBASE64Blob = rValue[k];
-                    byte[] decodedBytes = com.netscape.osutil.OSUtil.AtoB(asciiBASE64Blob);
+                    byte[] decodedBytes = Utils.base64decode(asciiBASE64Blob);
 
                     if (format.equals("crmf")) {
                         ByteArrayInputStream reqBlob =
@@ -291,7 +292,7 @@ public class CMCRequest {
                 ByteArrayOutputStream os = new ByteArrayOutputStream();
 
                 fullEnrollmentReq.encode(os);
-                ps.print(com.netscape.osutil.OSUtil.BtoA(os.toByteArray()));
+                ps.print(Utils.base64encode(os.toByteArray()));
             }
             String asciiBASE64Blob = bs.toString();
 
@@ -754,7 +755,7 @@ public class CMCRequest {
                 dig = salt.getBytes();
             }
 
-            sn = com.netscape.osutil.OSUtil.BtoA(dig);
+            sn = Utils.base64encode(dig);
         }
         byte bb[] = sn.getBytes();
         System.out.println("SenderNonce control: ");
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
index 57be364d7..f29984713 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
@@ -59,6 +59,8 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier;
 import org.mozilla.jss.pkix.primitive.Name;
 import org.mozilla.jss.util.Password;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * Tool for signing a CMC revocation request with an agent's certificate.
  * 
@@ -322,7 +324,7 @@ public class CMCRevoke {
             } catch (NoSuchAlgorithmException ex) {
                 dig = salt.getBytes();
             }
-            String sn = com.netscape.osutil.OSUtil.BtoA(dig);
+            String sn = Utils.base64encode(dig);
 
             TaggedAttribute senderNonce =
                     new TaggedAttribute(new INTEGER(bpid++), OBJECT_IDENTIFIER.id_cmc_senderNonce,
@@ -410,7 +412,7 @@ public class CMCRevoke {
             if (fullEnrollmentReq != null) {
                 // format is PR_REQUEST_CMC
                 fullEnrollmentReq.encode(os);
-                ps.print(com.netscape.osutil.OSUtil.BtoA(os.toByteArray()));
+                ps.print(Utils.base64encode(os.toByteArray()));
                 ////fullEnrollmentReq.print(ps); // no header/trailer
             }
 
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
index c45148f79..22ebd6715 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
@@ -68,6 +68,7 @@ import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo;
 import org.mozilla.jss.util.Password;
 
 import com.netscape.cmsutil.util.HMACDigest;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * A command-line utility used to generate a Certificate Request Message
@@ -309,7 +310,7 @@ public class CRMFPopClient {
             System.out.println("."); //key pair generated");
 
             // wrap private key
-            byte transport[] = com.netscape.osutil.OSUtil.AtoB(transportCert);
+            byte transport[] = Utils.base64decode(transportCert);
 
             X509Certificate tcert = manager.importCACertPackage(transport);
 
@@ -473,7 +474,7 @@ public class CRMFPopClient {
                 s1.addElement(crmfMsg);
                 byte encoded[] = ASN1Util.encode(s1);
 
-                String Req1 = com.netscape.osutil.OSUtil.BtoA(encoded);
+                String Req1 = Utils.base64encode(encoded);
 
                 if (OUTPUT_CERT_REQ != null) {
                     System.out.println("Generated Cert Request: ...... ");
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java
index c3a91dcd7..e2fd2c538 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java
@@ -65,6 +65,8 @@ import org.mozilla.jss.crypto.X509Certificate;
 import org.mozilla.jss.pkcs11.PK11PubKey;
 import org.mozilla.jss.util.Password;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * The DRMTool class is a utility program designed to operate on an LDIF file
  * to perform one or more of the following tasks:
@@ -1512,7 +1514,7 @@ public class DRMTool {
 
         // Decode the ASCII BASE 64 certificate enclosed in the
         // String() object into a BINARY BASE 64 byte[] object
-        decodedBASE64Cert = com.netscape.osutil.OSUtil.AtoB(
+        decodedBASE64Cert = Utils.base64decode(
                                 encodedBASE64Cert);
 
         // Create an X509CertImpl() object from
@@ -1842,13 +1844,13 @@ public class DRMTool {
                                                  0);
             if (mDebug) {
                 log("DEBUG: sk = '"
-                        + com.netscape.osutil.OSUtil.BtoA(sk.getEncoded())
+                        + Utils.base64encode(sk.getEncoded())
                         + "' length = '"
                         + sk.getEncoded().length
                         + "'"
                         + NEWLINE, false);
                 log("DEBUG: pri = '"
-                        + com.netscape.osutil.OSUtil.BtoA(pri)
+                        + Utils.base64encode(pri)
                         + "' length = '"
                         + pri.length
                         + "'"
@@ -3703,7 +3705,7 @@ public class DRMTool {
                         // enclosed in the String() object
                         // into a BINARY BASE 64 byte[] object
                         source_wrappedKeyData =
-                                com.netscape.osutil.OSUtil.AtoB(data);
+                                Utils.base64decode(data);
 
                         // rewrap the source wrapped private key data
                         target_wrappedKeyData = rewrap_wrapped_key_data(
@@ -3712,7 +3714,7 @@ public class DRMTool {
                         // Encode the BINARY BASE 64 byte[] object
                         // into an ASCII BASE 64 certificate
                         // enclosed in a String() object
-                        revised_data = com.netscape.osutil.OSUtil.BtoA(
+                        revised_data = Utils.base64encode(
                                            target_wrappedKeyData);
 
                         // Unformat the ASCII BASE 64 certificate
@@ -3777,7 +3779,7 @@ public class DRMTool {
                         // enclosed in the String() object
                         // into a BINARY BASE 64 byte[] object
                         source_wrappedKeyData =
-                                com.netscape.osutil.OSUtil.AtoB(data);
+                                Utils.base64decode(data);
 
                         // rewrap the source wrapped private key data
                         target_wrappedKeyData = rewrap_wrapped_key_data(
@@ -3786,7 +3788,7 @@ public class DRMTool {
                         // Encode the BINARY BASE 64 byte[] object
                         // into an ASCII BASE 64 certificate
                         // enclosed in a String() object
-                        revised_data = com.netscape.osutil.OSUtil.BtoA(
+                        revised_data = Utils.base64encode(
                                            target_wrappedKeyData);
 
                         // Unformat the ASCII BASE 64 certificate
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java b/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
index 4362839ea..48f180add 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/ExtJoiner.java
@@ -20,6 +20,8 @@ package com.netscape.cmstools;
 import java.io.FileInputStream;
 import java.io.IOException;
 
+import com.netscape.cmsutil.util.Utils;
+
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
 
@@ -81,7 +83,7 @@ public class ExtJoiner {
             DerOutputStream out = new DerOutputStream();
 
             out.putSequence(exts);
-            System.out.println(com.netscape.osutil.OSUtil.BtoA(out.toByteArray()));
+            System.out.println(Utils.base64encode(out.toByteArray()));
         } catch (IOException e) {
             System.out.println(e.toString());
         }
@@ -97,6 +99,6 @@ public class ExtJoiner {
         } finally {
             fis.close();
         }
-        return com.netscape.osutil.OSUtil.AtoB(new String(data));
+        return Utils.base64decode(new String(data));
     }
 }
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java b/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
index fc3511f27..35072aae3 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
@@ -19,6 +19,8 @@ package com.netscape.cmstools;
 
 import java.util.Vector;
 
+import com.netscape.cmsutil.util.Utils;
+
 import netscape.security.util.DerOutputStream;
 import netscape.security.util.DerValue;
 import netscape.security.util.ObjectIdentifier;
@@ -89,7 +91,7 @@ public class GenExtKeyUsage {
 
             // BASE64 encode the whole thing and write it to stdout
 
-            System.out.println(com.netscape.osutil.OSUtil.BtoA(extdos.toByteArray()));
+            System.out.println(Utils.base64encode(extdos.toByteArray()));
 
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java b/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
index 0c91d220e..5c905278f 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/GenIssuerAltNameExt.java
@@ -20,6 +20,8 @@ package com.netscape.cmstools;
 import java.io.ByteArrayOutputStream;
 import java.net.InetAddress;
 
+import com.netscape.cmsutil.util.Utils;
+
 import netscape.security.util.ObjectIdentifier;
 import netscape.security.x509.DNSName;
 import netscape.security.x509.GeneralNameInterface;
@@ -90,7 +92,7 @@ public class GenIssuerAltNameExt {
         ext.encode(os);
 
         System.out.println(
-                com.netscape.osutil.OSUtil.BtoA(os.toByteArray())
+                Utils.base64encode(os.toByteArray())
                 );
     }
 
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java b/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java
index c6814a4f7..35e07f772 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/GenSubjectAltNameExt.java
@@ -20,6 +20,8 @@ package com.netscape.cmstools;
 import java.io.ByteArrayOutputStream;
 import java.net.InetAddress;
 
+import com.netscape.cmsutil.util.Utils;
+
 import netscape.security.util.ObjectIdentifier;
 import netscape.security.x509.DNSName;
 import netscape.security.x509.GeneralNameInterface;
@@ -90,7 +92,7 @@ public class GenSubjectAltNameExt {
         ext.encode(os);
 
         System.out.println(
-                com.netscape.osutil.OSUtil.BtoA(os.toByteArray())
+                Utils.base64encode(os.toByteArray())
                 );
     }
 
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java b/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java
index 68e5fb5a1..e98847611 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/HttpClient.java
@@ -42,6 +42,8 @@ import org.mozilla.jss.ssl.SSLHandshakeCompletedListener;
 import org.mozilla.jss.ssl.SSLSocket;
 import org.mozilla.jss.util.Password;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * This class implements a CMC Enroll client for testing.
  * 
@@ -213,7 +215,7 @@ public class HttpClient {
 
         ByteArrayOutputStream bs = new ByteArrayOutputStream();
         PrintStream ps = new PrintStream(bs);
-        ps.print(com.netscape.osutil.OSUtil.BtoA(bout));
+        ps.print(Utils.base64encode(bout));
         System.out.println(bs.toString());
 
         System.out.println("");
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java b/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
index 860893a38..d127fd99a 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/OCSPClient.java
@@ -55,6 +55,7 @@ import com.netscape.cmsutil.ocsp.RevokedInfo;
 import com.netscape.cmsutil.ocsp.SingleResponse;
 import com.netscape.cmsutil.ocsp.TBSRequest;
 import com.netscape.cmsutil.ocsp.UnknownInfo;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * This class implements a OCSP client for testing.
@@ -129,7 +130,7 @@ public class OCSPClient {
         dos.flush();
 
         System.out.println("Data Length: " + request_data.length);
-        System.out.println("Data: " + com.netscape.osutil.OSUtil.BtoA(request_data));
+        System.out.println("Data: " + Utils.base64encode(request_data));
 
         InputStream iiss = socket.getInputStream();
         FileOutputStream fof = new FileOutputStream(output);
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
index 5c7722c5a..7cd50a37a 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
@@ -45,6 +45,7 @@ import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo;
 import org.mozilla.jss.util.Password;
 
 import com.netscape.cmsutil.util.HMACDigest;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Generates a 1024-bit RSA key pair in the security database, constructs a
@@ -152,7 +153,7 @@ public class PKCS10Client {
             certRequest.encode(bos);
             byte[] bb = bos.toByteArray();
 
-            String b64E = com.netscape.osutil.OSUtil.BtoA(bb);
+            String b64E = Utils.base64encode(bb);
 
             System.out.println("");
             System.out.println(b64E);
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
index abb09db62..ba7fb72a4 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
@@ -41,6 +41,8 @@ import org.mozilla.jss.crypto.TokenException;
 import org.mozilla.jss.util.Base64OutputStream;
 import org.mozilla.jss.util.Password;
 
+import com.netscape.cmsutil.util.Utils;
+
 /**
  * Tool for interacting with the PWcache
  * 
@@ -120,7 +122,7 @@ public class PasswordCache {
     }
 
     public static byte[] base64Decode(String s) throws IOException {
-        byte[] d = com.netscape.osutil.OSUtil.AtoB(s);
+        byte[] d = Utils.base64decode(s);
         return d;
     }
 
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
index ddbd95c8d..382c4e312 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
@@ -27,6 +27,8 @@ import java.io.InputStreamReader;
 import java.security.cert.CertificateException;
 import java.util.Locale;
 
+import com.netscape.cmsutil.util.Utils;
+
 import netscape.security.util.CertPrettyPrint;
 import netscape.security.x509.CertificateSubjectName;
 import netscape.security.x509.RDN;
@@ -171,7 +173,7 @@ public class PrettyPrintCert {
         // (5) Decode the ASCII BASE 64 certificate enclosed in the
         //     String() object into a BINARY BASE 64 byte[] object
 
-        decodedBASE64Cert = com.netscape.osutil.OSUtil.AtoB(encodedBASE64Cert);
+        decodedBASE64Cert = Utils.base64decode(encodedBASE64Cert);
 
         // (6) Create an X509CertImpl() object from the BINARY BASE 64
         //     byte[] object
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
index e191de027..8801b2423 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
@@ -28,6 +28,8 @@ import java.security.cert.CRLException;
 import java.security.cert.CertificateException;
 import java.util.Locale;
 
+import com.netscape.cmsutil.util.Utils;
+
 import netscape.security.util.CrlPrettyPrint;
 import netscape.security.x509.DeltaCRLIndicatorExtension;
 import netscape.security.x509.HoldInstructionExtension;
@@ -154,7 +156,7 @@ public class PrettyPrintCrl {
         // (5) Decode the ASCII BASE 64 CRL enclosed in the
         //     String() object into a BINARY BASE 64 byte[] object
 
-        decodedBASE64Crl = com.netscape.osutil.OSUtil.AtoB(encodedBASE64Crl);
+        decodedBASE64Crl = Utils.base64decode(encodedBASE64Crl);
 
         // (6) Create an X509CRLImpl() object from the BINARY BASE 64
         //     byte[] object