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

9 files changed, 23 insertions, 14 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
index 95f5ae7b8..0dfe4a26c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java
@@ -65,6 +65,7 @@ import com.netscape.cms.servlet.common.CMSRequest;
 import com.netscape.cms.servlet.common.CMSTemplate;
 import com.netscape.cms.servlet.common.CMSTemplateParams;
 import com.netscape.cms.servlet.common.ECMSGWException;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Revoke a certificate with a CMC-formatted revocation request
@@ -497,7 +498,7 @@ public class CMCRevReqServlet extends CMSServlet {
                     String b64eCert = req.getParameter("b64eCertificate");
 
                     if (b64eCert != null) {
-                        byte[] certBytes = com.netscape.osutil.OSUtil.AtoB(b64eCert);
+                        byte[] certBytes = Utils.base64decode(b64eCert);
                         X509CertImpl cert = new X509CertImpl(certBytes);
                         IArgBlock rarg = CMS.createArgBlock();
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
index e0978dd21..f056047cc 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ChallengeRevocationServlet1.java
@@ -64,6 +64,7 @@ import com.netscape.cms.servlet.common.CMSRequest;
 import com.netscape.cms.servlet.common.CMSTemplate;
 import com.netscape.cms.servlet.common.CMSTemplateParams;
 import com.netscape.cms.servlet.common.ECMSGWException;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Takes the certificate info (serial number) and optional challenge phrase, creates a
@@ -424,7 +425,7 @@ public class ChallengeRevocationServlet1 extends CMSServlet {
                     String b64eCert = req.getParameter("b64eCertificate");
 
                     if (b64eCert != null) {
-                        byte[] certBytes = com.netscape.osutil.OSUtil.AtoB(b64eCert);
+                        byte[] certBytes = Utils.base64decode(b64eCert);
                         X509CertImpl cert = new X509CertImpl(certBytes);
                         IArgBlock rarg = CMS.createArgBlock();
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
index 36746106a..4c0b56f0b 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayBySerial.java
@@ -65,6 +65,7 @@ import com.netscape.cms.servlet.common.CMSRequest;
 import com.netscape.cms.servlet.common.CMSTemplate;
 import com.netscape.cms.servlet.common.CMSTemplateParams;
 import com.netscape.cms.servlet.common.ECMSGWException;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Display detailed information about a certificate
@@ -378,7 +379,7 @@ public class DisplayBySerial extends CMSServlet {
             byte[] ba = cert.getEncoded();
             // Do base 64 encoding
 
-            header.addStringValue("certChainBase64", com.netscape.osutil.OSUtil.BtoA(ba));
+            header.addStringValue("certChainBase64", Utils.base64encode(ba));
             header.addStringValue("serialNumber", seq.toString(16));
 
             /*
@@ -424,7 +425,7 @@ public class DisplayBySerial extends CMSServlet {
                 p7.encodeSignedData(bos, false);
                 byte[] p7Bytes = bos.toByteArray();
 
-                p7Str = com.netscape.osutil.OSUtil.BtoA(p7Bytes);
+                p7Str = Utils.base64encode(p7Bytes);
                 header.addStringValue("pkcs7ChainBase64", p7Str);
             } catch (Exception e) {
                 //p7Str = "PKCS#7 B64 Encoding error - " + e.toString() 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
index f5422c2fc..ad503272a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
@@ -48,6 +48,7 @@ import com.netscape.cms.servlet.common.CMSRequest;
 import com.netscape.cms.servlet.common.CMSTemplate;
 import com.netscape.cms.servlet.common.CMSTemplateParams;
 import com.netscape.cms.servlet.common.ECMSGWException;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Decode the CRL and display it to the requester.
@@ -341,7 +342,7 @@ public class DisplayCRL extends CMSServlet {
             } else if (crlDisplayType.equals("base64Encoded")) {
                 try {
                     byte[] ba = crl.getEncoded();
-                    String crlBase64Encoded = com.netscape.osutil.OSUtil.BtoA(ba);
+                    String crlBase64Encoded = Utils.base64encode(ba);
                     int length = crlBase64Encoded.length();
                     int i = 0;
                     int j = 0;
@@ -414,7 +415,7 @@ public class DisplayCRL extends CMSServlet {
 
                                 try {
                                     byte[] ba = deltaCRL.getEncoded();
-                                    String crlBase64Encoded = com.netscape.osutil.OSUtil.BtoA(ba);
+                                    String crlBase64Encoded = Utils.base64encode(ba);
                                     int length = crlBase64Encoded.length();
                                     int i = 0;
                                     int j = 0;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
index b32ce5e11..b580d7f79 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/EnrollServlet.java
@@ -73,6 +73,7 @@ import com.netscape.cms.servlet.processors.CRMFProcessor;
 import com.netscape.cms.servlet.processors.KeyGenProcessor;
 import com.netscape.cms.servlet.processors.PKCS10Processor;
 import com.netscape.cms.servlet.processors.PKIProcessor;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Submit a Certificate Enrollment request
@@ -1746,7 +1747,7 @@ public class EnrollServlet extends CMSServlet {
         if (rawData != null) {
             String base64Data = null;
 
-            base64Data = com.netscape.osutil.OSUtil.BtoA(rawData).trim();
+            base64Data = Utils.base64encode(rawData).trim();
 
             StringBuffer sb = new StringBuffer();
             // extract all line separators from the "base64Data"
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
index 21a0c1d20..4c8661359 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetCRL.java
@@ -46,6 +46,7 @@ import com.netscape.cms.servlet.common.CMSRequest;
 import com.netscape.cms.servlet.common.CMSTemplate;
 import com.netscape.cms.servlet.common.CMSTemplateParams;
 import com.netscape.cms.servlet.common.ECMSGWException;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Retrieve CRL for a Certificate Authority
@@ -334,7 +335,7 @@ public class GetCRL extends CMSServlet {
                 } else if (crlDisplayType.equals("base64Encoded")) {
                     try {
                         byte[] ba = crl.getEncoded();
-                        String crlBase64Encoded = com.netscape.osutil.OSUtil.BtoA(ba);
+                        String crlBase64Encoded = Utils.base64encode(ba);
                         int length = crlBase64Encoded.length();
                         int i = 0;
                         int j = 0;
@@ -374,7 +375,7 @@ public class GetCRL extends CMSServlet {
 
                     try {
                         byte[] ba = crl.getEncoded();
-                        String crlBase64Encoded = com.netscape.osutil.OSUtil.BtoA(ba);
+                        String crlBase64Encoded = Utils.base64encode(ba);
                         int length = crlBase64Encoded.length();
                         int i = 0;
                         int j = 0;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
index 5e4f7a427..2f551d3f5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ImportCertsTemplateFiller.java
@@ -56,6 +56,7 @@ import com.netscape.cms.servlet.common.CMSRequest;
 import com.netscape.cms.servlet.common.CMSTemplateParams;
 import com.netscape.cms.servlet.common.ECMSGWException;
 import com.netscape.cms.servlet.common.ICMSTemplateFiller;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Set up HTTP response to import certificate into browsers
@@ -352,7 +353,7 @@ public class ImportCertsTemplateFiller implements ICMSTemplateFiller {
 
             certRepContent.encode(certRepOut);
             byte[] certRepBytes = certRepOut.toByteArray();
-            String certRepB64 = com.netscape.osutil.OSUtil.BtoA(certRepBytes);
+            String certRepB64 = Utils.base64encode(certRepBytes);
             // add CR to each return as required by cartman
             BufferedReader certRepB64lines =
                     new BufferedReader(new StringReader(certRepB64));
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
index a4d434bd4..663eaae1a 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
@@ -55,6 +55,7 @@ import com.netscape.cms.servlet.common.CMSRequest;
 import com.netscape.cms.servlet.common.CMSTemplate;
 import com.netscape.cms.servlet.common.CMSTemplateParams;
 import com.netscape.cms.servlet.common.ECMSGWException;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * Perform the first step in revoking a certificate
@@ -280,7 +281,7 @@ public class RevocationServlet extends CMSServlet {
                 byte[] ba = old_cert.getEncoded();
                 // Do base 64 encoding
 
-                header.addStringValue("b64eCertificate", com.netscape.osutil.OSUtil.BtoA(ba));
+                header.addStringValue("b64eCertificate", Utils.base64encode(ba));
             } catch (CertificateEncodingException e) {
             }
         }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index 99febb4cf..525775d62 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
@@ -120,6 +120,7 @@ import com.netscape.certsrv.request.RequestId;
 import com.netscape.certsrv.request.RequestStatus;
 import com.netscape.cms.servlet.profile.SSLClientCertProvider;
 import com.netscape.cmsutil.scep.CRSPKIMessage;
+import com.netscape.cmsutil.util.Utils;
 
 /**
  * This servlet deals with PKCS#10-based certificate requests from
@@ -576,7 +577,7 @@ public class CRSEnrollment extends HttpServlet {
         byte[] response = null;
         String responseData = "";
 
-        decodedPKIMessage = com.netscape.osutil.OSUtil.AtoB(msg);
+        decodedPKIMessage = Utils.base64decode(msg);
 
         try {
             ByteArrayInputStream is = new ByteArrayInputStream(decodedPKIMessage);
@@ -817,7 +818,7 @@ public class CRSEnrollment extends HttpServlet {
         byte[] response = null;
         X509CertImpl cert = null;
 
-        decodedPKIMessage = com.netscape.osutil.OSUtil.AtoB(msg);
+        decodedPKIMessage = Utils.base64decode(msg);
 
         try {
             ByteArrayInputStream is = new ByteArrayInputStream(decodedPKIMessage);
@@ -1787,7 +1788,7 @@ public class CRSEnrollment extends HttpServlet {
     protected 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;
     }