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, 8 insertions, 6 deletions

diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
index 8bcc74de5..ac44672d2 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java
@@ -99,6 +99,7 @@ import com.netscape.cmscore.cert.CertPrettyPrint;
 import com.netscape.cmscore.cert.CertUtils;
 import com.netscape.cmscore.util.Debug;
 import com.netscape.cmsutil.crypto.CryptoUtil;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Subsystem for initializing JSS>
@@ -1660,7 +1661,7 @@ public final class JssSubsystem implements ICryptoSubsystem {
             DN dn = new DN(principal.getName());
             BigInteger serialno = cert.getSerialNumber();
             String suffix = "." + System.currentTimeMillis();
-            String b64E = com.netscape.osutil.OSUtil.BtoA(cert.getEncoded());
+            String b64E = Utils.base64encode(cert.getEncoded());
             PrintStream stream = new PrintStream(new FileOutputStream(pathname + suffix));
 
             stream.println("-----BEGIN CERTIFICATE-----");
@@ -2017,7 +2018,7 @@ public final class JssSubsystem implements ICryptoSubsystem {
                 String content = "";
                 String noHeader = CertUtils.stripCertBrackets(b64E);
                 String normalized = CertUtils.normalizeCertStr(noHeader);
-                byte data[] = com.netscape.osutil.OSUtil.AtoB(normalized);
+                byte data[] = Utils.base64decode(normalized);
 
                 ContentInfo ci = (ContentInfo)
                         ASN1Util.decode(ContentInfo.getTemplate(), data);
diff --git a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
index 3eef57718..20cdae832 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java
@@ -114,6 +114,7 @@ import com.netscape.cmscore.dbs.BigIntegerMapper;
 import com.netscape.cmscore.dbs.DateMapper;
 import com.netscape.cmscore.dbs.X509CertImplMapper;
 import com.netscape.cmsutil.crypto.CryptoUtil;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * This class provides all the base methods to generate the key for different
@@ -136,7 +137,7 @@ public class KeyCertUtil {
         if (ext != null) {
             try {
 
-                b = (byte[]) (com.netscape.osutil.OSUtil.AtoB(ext));
+                b = Utils.base64decode(ext);
                 // this b can be "Extension" Or "SEQUENCE OF Extension"
                 DerValue b_der = new DerValue(b);
 
@@ -761,7 +762,7 @@ public class KeyCertUtil {
     public static byte[] convertB64EToByteArray(String b64E)
             throws CertificateException, IOException {
         String str = CertUtils.stripCertBrackets(b64E);
-        byte bCert[] = (byte[]) (com.netscape.osutil.OSUtil.AtoB(str));
+        byte bCert[] = Utils.base64decode(str);
 
         /*
          java.security.cert.X509Certificate cert = 
@@ -804,7 +805,7 @@ public class KeyCertUtil {
         String b64E = properties.getDerExtension();
 
         if (b64E != null) {
-            byte[] b = (byte[]) (com.netscape.osutil.OSUtil.AtoB(b64E));
+            byte[] b = Utils.base64decode(b64E);
 
             // this b can be "Extension" Or "SEQUENCE OF Extension"
             try {
diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java b/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
index 4142f6abe..6c834d0e0 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/PWsdrCache.java
@@ -184,7 +184,7 @@ public class PWsdrCache {
     }
 
     public byte[] base64Decode(String s) throws IOException {
-        byte[] d = com.netscape.osutil.OSUtil.AtoB(s);
+        byte[] d = Utils.base64decode(s);
         return d;
     }