diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-15 15:01:42 -0600 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-23 21:14:28 -0600 |
commit | 970e3667eede41e72bb5a4cadf1d056ff526d944 (patch) | |
tree | 4bd18490efeb4245ff739a9c1558520b25a8f992 /pki/base/common/src | |
parent | 34496a33fbbee462f67410e2ee54a7986b3aedae (diff) | |
download | pki-970e3667eede41e72bb5a4cadf1d056ff526d944.tar.gz pki-970e3667eede41e72bb5a4cadf1d056ff526d944.tar.xz pki-970e3667eede41e72bb5a4cadf1d056ff526d944.zip |
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
Diffstat (limited to 'pki/base/common/src')
35 files changed, 88 insertions, 56 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java b/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java index 23cb1957a..8c13fca56 100644 --- a/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java +++ b/pki/base/common/src/com/netscape/certsrv/base/KeyGenInfo.java @@ -19,6 +19,8 @@ package com.netscape.certsrv.base; import java.io.IOException; +import com.netscape.cmsutil.util.Utils; + import netscape.security.util.DerInputStream; import netscape.security.util.DerValue; import netscape.security.x509.AlgorithmId; @@ -197,7 +199,7 @@ public class KeyGenInfo { private byte[] base64Decode(String spkac) throws IOException { - return com.netscape.osutil.OSUtil.AtoB(spkac); + return Utils.base64decode(spkac); } private void derDecode(byte spkac[]) diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java index 57b86157e..2537efa10 100644 --- a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java @@ -200,7 +200,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo { public String hashFingerprint(String host, String pageID, String uid) { byte[] hash = mSHADigest.digest((SALT + pageID + getSecret(host) + uid).getBytes()); - String b64E = com.netscape.osutil.OSUtil.BtoA(hash); + String b64E = Utils.base64encode(hash); return "{SHA}" + b64E; } diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java index 88e859798..ee656a199 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java @@ -44,6 +44,7 @@ import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ca.ICMSCRLExtension; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; +import com.netscape.cmsutil.util.Utils; /** * This represents a issuer alternative name extension. @@ -158,7 +159,7 @@ public class CMSIssuerAlternativeNameExtension } else if (nameType.equalsIgnoreCase(PROP_OTHER_NAME)) { try { - byte[] val = com.netscape.osutil.OSUtil.AtoB(name); + byte[] val = Utils.base64decode(name); DerValue derVal = new DerValue(new ByteArrayInputStream(val)); GeneralName generalName = new GeneralName(derVal); diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java index b2f654b77..023605db4 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.policy.IRenewalPolicy; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; +import com.netscape.cmsutil.util.Utils; /** * RenewalValidityConstraints is a default rule for Certificate @@ -338,7 +339,7 @@ public class RenewalValidityConstraints extends APolicyRule sb.append("\n"); try { byte[] ba = cert.getEncoded(); - String encodedCert = com.netscape.osutil.OSUtil.BtoA(ba); + String encodedCert = Utils.base64encode(ba); sb.append(CERT_HEADER + encodedCert + CERT_TRAILER); } catch (Exception e) { diff --git a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java b/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java index d8cec78d8..5e8ad1282 100644 --- a/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java +++ b/pki/base/common/src/com/netscape/cms/publish/publishers/FileBasedPublisher.java @@ -45,6 +45,7 @@ import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.ldap.ELdapException; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.publish.ILdapPublisher; +import com.netscape.cmsutil.util.Utils; /** * This publisher writes certificate and CRL into @@ -368,7 +369,7 @@ public class FileBasedPublisher implements ILdapPublisher, IExtendedPluginInfo { ByteArrayOutputStream os = new ByteArrayOutputStream(); fos = new FileOutputStream(tempFile); - fos.write(com.netscape.osutil.OSUtil.BtoA(encodedArray).getBytes()); + fos.write(Utils.base64encode(encodedArray).getBytes()); fos.close(); destName = baseName + ".b64"; destFile = new File(destName); diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java index 8f1024723..0e3d2c228 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -54,6 +54,7 @@ import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; import com.netscape.cms.servlet.base.UserInfo; +import com.netscape.cmsutil.util.Utils; /** * A class represents an administration servlet that @@ -368,7 +369,7 @@ public class AdminServlet extends HttpServlet { String authToken = req.getHeader(HDR_AUTHORIZATION); String b64s = authToken.substring( authToken.lastIndexOf(' ') + 1); - String authCode = new String(com.netscape.osutil.OSUtil.AtoB(b64s)); + String authCode = new String(Utils.base64decode(b64s)); String userid = authCode.substring(0, authCode.indexOf(':')); String password = authCode.substring( diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java index 6161a20d6..58fb1d03f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java @@ -77,6 +77,7 @@ import com.netscape.certsrv.selftests.ISelfTest; import com.netscape.certsrv.selftests.ISelfTestSubsystem; import com.netscape.certsrv.tks.ITKSAuthority; import com.netscape.cmsutil.util.Cert; +import com.netscape.cmsutil.util.Utils; import com.netscape.symkey.SessionKey; /** @@ -2379,7 +2380,7 @@ public final class CMSAdminServlet extends AdminServlet { byte[] bCert = null; try { - bCert = (byte[]) (com.netscape.osutil.OSUtil.AtoB(b64Cert)); + bCert = Utils.base64decode(b64Cert); } catch (Exception e) { CMS.debug("CMSAdminServlet: exception: " + e.toString()); } @@ -3422,7 +3423,7 @@ public final class CMSAdminServlet extends AdminServlet { if (rawData != null) { String base64Data = null; - base64Data = com.netscape.osutil.OSUtil.BtoA(rawData).trim(); + base64Data = Utils.base64encode(rawData).trim(); // extract all line separators from the "base64Data" for (int i = 0; i < base64Data.length(); i++) { diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java index 6eaf004f9..3783ead6f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java @@ -56,6 +56,7 @@ import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; import com.netscape.cmsutil.util.Cert; +import com.netscape.cmsutil.util.Utils; /** * A class representing an administration servlet for @@ -1045,7 +1046,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // Base64 decode cert try { - byte bCert[] = (byte[]) (com.netscape.osutil.OSUtil.AtoB(certsString)); + byte bCert[] = Utils.base64decode(certsString); X509Certificate cert = new X509CertImpl(bCert); certs = new X509Certificate[1]; @@ -1056,7 +1057,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // could it be a pkcs7 blob? CMS.debug("UsrGrpAdminServlet: " + CMS.getLogMessage("ADMIN_SRVLT_IS_PK_BLOB")); - byte p7Cert[] = (byte[]) (com.netscape.osutil.OSUtil.AtoB(certsString)); + byte p7Cert[] = Utils.base64decode(certsString); try { CryptoManager manager = CryptoManager.getInstance(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java index a32116b43..c0931ee2f 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -96,6 +96,7 @@ import com.netscape.cms.servlet.common.GenSvcPendingTemplateFiller; import com.netscape.cms.servlet.common.GenUnexpectedErrorTemplateFiller; import com.netscape.cms.servlet.common.ICMSTemplateFiller; import com.netscape.cms.servlet.common.ServletUtils; +import com.netscape.cmsutil.util.Utils; import com.netscape.cmsutil.xml.XMLObject; /** @@ -1563,7 +1564,7 @@ public abstract class CMSServlet extends HttpServlet { protected String hashPassword(String pwd) { String salt = generateSalt(); byte[] pwdDigest = mSHADigest.digest((salt + pwd).getBytes()); - String b64E = com.netscape.osutil.OSUtil.BtoA(pwdDigest); + String b64E = Utils.base64encode(pwdDigest); return "{SHA}" + salt + ";" + b64E; } 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; } diff --git a/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java index b2c43b3f7..4f708f789 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/connector/ConnectorServlet.java @@ -71,6 +71,7 @@ import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.util.Utils; /** * Connector servlet @@ -1094,7 +1095,7 @@ public class ConnectorServlet 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/csadmin/RegisterUser.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java index 1a621d53d..0042cdb5a 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/RegisterUser.java @@ -45,6 +45,7 @@ import com.netscape.cms.servlet.base.CMSServlet; import com.netscape.cms.servlet.base.UserInfo; import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cms.servlet.common.ICMSTemplateFiller; +import com.netscape.cmsutil.util.Utils; import com.netscape.cmsutil.xml.XMLObject; /** @@ -161,7 +162,7 @@ public class RegisterUser extends CMSServlet { byte bCert[] = null; X509CertImpl cert = null; - bCert = (byte[]) (com.netscape.osutil.OSUtil.AtoB(certsString)); + bCert = Utils.base64decode(certsString); cert = new X509CertImpl(bCert); certs[0] = (X509Certificate) cert; diff --git a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java b/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java index 24c163847..3d5e93a56 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/ocsp/OCSPServlet.java @@ -45,6 +45,7 @@ import com.netscape.cmsutil.ocsp.ResponseBytes; import com.netscape.cmsutil.ocsp.ResponseData; import com.netscape.cmsutil.ocsp.SingleResponse; import com.netscape.cmsutil.ocsp.TBSRequest; +import com.netscape.cmsutil.util.Utils; /** * Process OCSP messages, According to RFC 2560 @@ -174,7 +175,7 @@ public class OCSPServlet extends CMSServlet { throw new Exception("OCSPServlet: OCSP request not provided in GET method"); } is = new ByteArrayInputStream( - com.netscape.osutil.OSUtil.AtoB(pathInfo.substring(1))); + Utils.base64decode(pathInfo.substring(1))); } // (1) retrieve OCSP request diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java index 3c75be021..e482b67da 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileProcessServlet.java @@ -62,6 +62,7 @@ import com.netscape.certsrv.template.ArgSet; import com.netscape.certsrv.util.IStatsSubsystem; import com.netscape.cms.profile.common.ProfilePolicy; import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.util.Utils; /** * This servlet approves profile-based request. @@ -932,7 +933,7 @@ public class ProfileProcessServlet extends ProfileServlet { if (rawData != null) { String base64Data = null; - base64Data = com.netscape.osutil.OSUtil.BtoA(rawData).trim(); + base64Data = Utils.base64encode(rawData).trim(); // extract all line separators from the "base64Data" StringBuffer sb = new StringBuffer(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java index 2849e14f3..16451f6dd 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java @@ -62,6 +62,7 @@ import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.servlet.common.AuthCredentials; import com.netscape.cms.servlet.common.CMCOutputTemplate; import com.netscape.cms.servlet.common.CMSRequest; +import com.netscape.cmsutil.util.Utils; /** * This servlet submits end-user request into the profile framework. @@ -256,7 +257,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { } } - requestB64 = com.netscape.osutil.OSUtil.BtoA(reqbuf); + requestB64 = Utils.base64encode(reqbuf); if (CMS.debugOn()) { CMS.debug("Start of ProfileSubmitCMCServlet Input Parameters"); @@ -876,7 +877,7 @@ public class ProfileSubmitCMCServlet extends ProfileServlet { if (rawData != null) { String base64Data = null; - base64Data = com.netscape.osutil.OSUtil.BtoA(rawData).trim(); + base64Data = Utils.base64encode(rawData).trim(); // extract all line separators from the "base64Data" StringBuffer sb = new StringBuffer(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java index 1d4cab76b..0bb038677 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/profile/ProfileSubmitServlet.java @@ -68,6 +68,7 @@ import com.netscape.certsrv.util.IStatsSubsystem; import com.netscape.cms.servlet.common.AuthCredentials; import com.netscape.cms.servlet.common.CMSRequest; import com.netscape.cmsutil.util.Cert; +import com.netscape.cmsutil.util.Utils; import com.netscape.cmsutil.xml.XMLObject; /** @@ -1603,7 +1604,7 @@ public class ProfileSubmitServlet extends ProfileServlet { if (rawData != null) { String base64Data = null; - base64Data = com.netscape.osutil.OSUtil.BtoA(rawData).trim(); + base64Data = Utils.base64encode(rawData).trim(); // extract all line separators from the "base64Data" StringBuffer sb = new StringBuffer(); diff --git a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java b/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java index cbe73c79f..68328a73c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java +++ b/pki/base/common/src/com/netscape/cms/servlet/request/ProcessCertReq.java @@ -78,6 +78,7 @@ import com.netscape.cms.servlet.common.CMSTemplate; 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; /** * Agent operations on Certificate requests. This servlet is used @@ -617,7 +618,7 @@ public class ProcessCertReq extends CMSServlet { if (addExts != null && !addExts.trim().equals("")) { Vector<Extension> extsToBeAdded = new Vector<Extension>(); - byte[] b = (byte[]) (com.netscape.osutil.OSUtil.AtoB(addExts)); + byte[] b = Utils.base64decode(addExts); // this b can be "Extension" Or "SEQUENCE OF Extension" try { @@ -1851,7 +1852,7 @@ public class ProcessCertReq extends CMSServlet { if (rawData != null) { String base64Data = null; - base64Data = com.netscape.osutil.OSUtil.BtoA(rawData).trim(); + base64Data = Utils.base64encode(rawData).trim(); // extract all line separators from the "base64Data" StringBuffer sb = new StringBuffer(); 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; } |