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

10 files changed, 29 insertions, 22 deletions

diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
index 5071a1c80..ba8462727 100644
--- a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
+++ b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java
@@ -170,7 +170,7 @@ import com.netscape.cmscore.util.Debug;
 import com.netscape.cmscore.util.OsSubsystem;
 import com.netscape.cmsutil.net.ISocketFactory;
 import com.netscape.cmsutil.password.IPasswordStore;
-import com.netscape.osutil.OSUtil;
+import com.netscape.cmsutil.util.Utils;
 
 public class CMSEngine implements ICMSEngine {
     private static final String ID = "MAIN";
@@ -1382,11 +1382,11 @@ public class CMSEngine implements ICMSEngine {
     }
 
     public String BtoA(byte data[]) {
-        return OSUtil.BtoA(data);
+        return Utils.base64encode(data);
     }
 
     public byte[] AtoB(String data) {
-        return OSUtil.AtoB(data);
+        return Utils.base64decode(data);
     }
 
     public String getEncodedCert(X509Certificate cert) {
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
index 48f743ee3..1c4d9fbcf 100644
--- a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
+++ b/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java
@@ -46,6 +46,7 @@ import com.netscape.cmscore.base.SubsystemRegistry;
 import com.netscape.cmscore.dbs.CertRecord;
 import com.netscape.cmscore.dbs.CertificateRepository;
 import com.netscape.cmscore.util.Debug;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Challenge phrase based authentication.
@@ -405,7 +406,7 @@ public class ChallengePhraseAuthentication implements IAuthManager {
     private String hashPassword(String pwd) {
         String salt = "lala123";
         byte[] pwdDigest = mSHADigest.digest((salt + pwd).getBytes());
-        String b64E = com.netscape.osutil.OSUtil.BtoA(pwdDigest);
+        String b64E = Utils.base64encode(pwdDigest);
 
         return "{SHA}" + b64E;
     }
diff --git a/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java b/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java
index 905f7c8db..62b5971a4 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java
+++ b/pki/base/common/src/com/netscape/cmscore/base/ArgBlock.java
@@ -32,6 +32,7 @@ import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IArgBlock;
 import com.netscape.certsrv.base.KeyGenInfo;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * This class represents a set of indexed arguments.
@@ -697,7 +698,7 @@ public class ArgBlock implements IArgBlock {
         PKCS10 pkcs10 = null;
 
         try {
-            byte[] decodedBytes = com.netscape.osutil.OSUtil.AtoB(base64Request);
+            byte[] decodedBytes = Utils.base64decode(base64Request);
 
             pkcs10 = new PKCS10(decodedBytes);
         } catch (NoSuchProviderException e) {
diff --git a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
index 482bcc7b9..1e46d3ef3 100644
--- a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
+++ b/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java
@@ -36,6 +36,7 @@ import com.netscape.certsrv.base.EPropertyNotDefined;
 import com.netscape.certsrv.base.EPropertyNotFound;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.ISourceConfigStore;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * A class represents a in-memory configuration store.
@@ -342,7 +343,7 @@ public class PropConfigStore implements IConfigStore, Cloneable {
         } else {
             CMS.traceHashKey(mDebugType, getFullName(name),
                     "<bytearray>", "<bytearray>");
-            return com.netscape.osutil.OSUtil.AtoB(str);
+            return Utils.base64decode(str);
         }
     }
 
diff --git a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
index a5c6fec90..9710d63f5 100644
--- a/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
+++ b/pki/base/common/src/com/netscape/cmscore/cert/CertUtils.java
@@ -60,7 +60,7 @@ import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.logging.ILogger;
-import com.netscape.osutil.OSUtil;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Utility class with assorted methods to check for
@@ -157,7 +157,7 @@ public class CertUtils {
         PKCS10 pkcs10 = null;
 
         try {
-            byte[] decodedBytes = com.netscape.osutil.OSUtil.AtoB(normalized);
+            byte[] decodedBytes = Utils.base64decode(normalized);
 
             pkcs10 = new PKCS10(decodedBytes);
         } catch (Exception e) {
@@ -548,7 +548,7 @@ public class CertUtils {
     public static String toMIME64(X509CertImpl cert) {
         try {
             return "-----BEGIN CERTIFICATE-----\n" +
-                    com.netscape.osutil.OSUtil.BtoA(cert.getEncoded()) +
+                    Utils.base64encode(cert.getEncoded()) +
                     "-----END CERTIFICATE-----\n";
         } catch (CertificateException e) {
         }
@@ -559,7 +559,7 @@ public class CertUtils {
             throws IOException {
         mime64 = stripCertBrackets(mime64.trim());
         String newval = normalizeCertStr(mime64);
-        byte rawPub[] = com.netscape.osutil.OSUtil.AtoB(newval);
+        byte rawPub[] = Utils.base64decode(newval);
         X509Certificate cert = null;
 
         try {
@@ -573,7 +573,7 @@ public class CertUtils {
             throws IOException {
         mime64 = stripCertBrackets(mime64.trim());
         String newval = normalizeCertStr(mime64);
-        byte rawPub[] = com.netscape.osutil.OSUtil.AtoB(newval);
+        byte rawPub[] = Utils.base64decode(newval);
         PKCS7 p7 = null;
 
         try {
@@ -588,7 +588,7 @@ public class CertUtils {
             throws IOException {
         mime64 = stripCRLBrackets(mime64.trim());
         String newval = normalizeCertStr(mime64);
-        byte rawPub[] = com.netscape.osutil.OSUtil.AtoB(newval);
+        byte rawPub[] = Utils.base64decode(newval);
         X509CRL crl = null;
 
         try {
@@ -601,7 +601,7 @@ public class CertUtils {
     public static X509CRL mapCRL1(String mime64)
             throws IOException {
         mime64 = stripCRLBrackets(mime64.trim());
-        byte rawPub[] = OSUtil.AtoB(mime64);
+        byte rawPub[] = Utils.base64decode(mime64);
         X509CRL crl = null;
 
         try {
diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
index b76670946..76d39b3ed 100644
--- a/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
+++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpRequestEncoder.java
@@ -26,6 +26,7 @@ import java.io.OptionalDataException;
 
 import com.netscape.certsrv.connector.IRequestEncoder;
 import com.netscape.cmscore.util.Debug;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * encodes a request by serializing it.
@@ -40,7 +41,7 @@ public class HttpRequestEncoder implements IRequestEncoder {
 
         os.writeObject(r);
         serial = ba.toByteArray();
-        s = com.netscape.osutil.OSUtil.BtoA(serial);
+        s = Utils.base64encode(serial);
         return s;
     }
 
@@ -51,7 +52,7 @@ public class HttpRequestEncoder implements IRequestEncoder {
 
         try {
 
-            serial = com.netscape.osutil.OSUtil.AtoB(s);
+            serial = Utils.base64decode(s);
             ByteArrayInputStream ba = new ByteArrayInputStream(serial);
             ObjectInputStream is = new ObjectInputStream(ba);
 
diff --git a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
index 14062e9d4..6afaea997 100644
--- a/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
+++ b/pki/base/common/src/com/netscape/cmscore/policy/GeneralNameUtil.java
@@ -48,6 +48,7 @@ import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig;
 import com.netscape.certsrv.policy.IGeneralNamesConfig;
 import com.netscape.certsrv.policy.ISubjAltNameConfig;
 import com.netscape.cmscore.util.Debug;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Class that can be used to form general names from configuration file.
@@ -101,7 +102,7 @@ public class GeneralNameUtil implements IGeneralNameUtil {
 
         try {
             if (generalNameChoice.equalsIgnoreCase(GENNAME_CHOICE_OTHERNAME)) {
-                byte[] val = com.netscape.osutil.OSUtil.AtoB(value);
+                byte[] val = Utils.base64decode(value);
 
                 derVal = new DerValue(new ByteArrayInputStream(val));
                 Debug.trace("otherName formed");
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;
     }