diff options
Diffstat (limited to 'pki/base/silent/src/com/netscape/pkisilent')
11 files changed, 25 insertions, 26 deletions
diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java index ee41e5a19..4dc77b894 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java @@ -33,13 +33,13 @@ import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.pkcs12.AuthenticatedSafes; import org.mozilla.jss.pkcs12.PFX; -import com.netscape.osutil.OSUtil; import com.netscape.pkisilent.argparser.ArgParser; import com.netscape.pkisilent.argparser.StringHolder; import com.netscape.pkisilent.common.ComCrypto; import com.netscape.pkisilent.common.ParseXML; import com.netscape.pkisilent.http.HTTPClient; import com.netscape.pkisilent.http.HTTPResponse; +import com.netscape.cmsutil.util.Utils; public class ConfigureCA { @@ -1035,7 +1035,7 @@ public class ConfigureCA { // Convert a byte array to base64 string // cert_to_import = new sun.misc.BASE64Encoder().encode( // hr.getResponseData()); - cert_to_import = OSUtil.BtoA(hr.getResponseData()); + cert_to_import = Utils.base64encode(hr.getResponseData()); // Convert base64 string to a byte array // buf = new sun.misc.BASE64Decoder().decodeBuffer(s); diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java index caf393ad9..7d15861d1 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java @@ -31,13 +31,13 @@ import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.pkcs12.AuthenticatedSafes; import org.mozilla.jss.pkcs12.PFX; -import com.netscape.osutil.OSUtil; import com.netscape.pkisilent.argparser.ArgParser; import com.netscape.pkisilent.argparser.StringHolder; import com.netscape.pkisilent.common.ComCrypto; import com.netscape.pkisilent.common.ParseXML; import com.netscape.pkisilent.http.HTTPClient; import com.netscape.pkisilent.http.HTTPResponse; +import com.netscape.cmsutil.util.Utils; public class ConfigureDRM { @@ -775,7 +775,7 @@ public class ConfigureDRM { // String cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = - OSUtil.BtoA(hr.getResponseData()); + Utils.base64encode(hr.getResponseData()); System.out.println("Imported Cert=" + cert_to_import); ComCrypto cCrypt = new ComCrypto(client_certdb_dir, diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java index 254d9bcec..149c79dff 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java @@ -31,13 +31,13 @@ import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.pkcs12.AuthenticatedSafes; import org.mozilla.jss.pkcs12.PFX; -import com.netscape.osutil.OSUtil; import com.netscape.pkisilent.argparser.ArgParser; import com.netscape.pkisilent.argparser.StringHolder; import com.netscape.pkisilent.common.ComCrypto; import com.netscape.pkisilent.common.ParseXML; import com.netscape.pkisilent.http.HTTPClient; import com.netscape.pkisilent.http.HTTPResponse; +import com.netscape.cmsutil.util.Utils; public class ConfigureOCSP { public static final String DEFAULT_KEY_TYPE = "RSA"; @@ -676,7 +676,7 @@ public class ConfigureOCSP { // String cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = - OSUtil.BtoA(hr.getResponseData()); + Utils.base64encode(hr.getResponseData()); System.out.println("Imported Cert=" + cert_to_import); ComCrypto cCrypt = new ComCrypto(client_certdb_dir, diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java index cade95fa8..2d109595a 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java @@ -21,13 +21,13 @@ package com.netscape.pkisilent; import java.io.ByteArrayInputStream; import java.net.URLEncoder; -import com.netscape.osutil.OSUtil; import com.netscape.pkisilent.argparser.ArgParser; import com.netscape.pkisilent.argparser.StringHolder; import com.netscape.pkisilent.common.ComCrypto; import com.netscape.pkisilent.common.ParseXML; import com.netscape.pkisilent.http.HTTPClient; import com.netscape.pkisilent.http.HTTPResponse; +import com.netscape.cmsutil.util.Utils; public class ConfigureRA { @@ -516,7 +516,7 @@ public class ConfigureRA { // cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); cert_to_import = - OSUtil.BtoA(hr.getResponseData()); + Utils.base64encode(hr.getResponseData()); } catch (Exception e) { System.out.println("ERROR: failed to retrieve cert"); diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java index 62947e4a2..6dacc9e08 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java @@ -22,13 +22,13 @@ import java.io.ByteArrayInputStream; import java.net.URLEncoder; import java.util.ArrayList; -import com.netscape.osutil.OSUtil; import com.netscape.pkisilent.argparser.ArgParser; import com.netscape.pkisilent.argparser.StringHolder; import com.netscape.pkisilent.common.ComCrypto; import com.netscape.pkisilent.common.ParseXML; import com.netscape.pkisilent.http.HTTPClient; import com.netscape.pkisilent.http.HTTPResponse; +import com.netscape.cmsutil.util.Utils; public class ConfigureSubCA { @@ -706,7 +706,7 @@ public class ConfigureSubCA { // String cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = - OSUtil.BtoA(hr.getResponseData()); + Utils.base64encode(hr.getResponseData()); System.out.println("Imported Cert=" + cert_to_import); ComCrypto cCrypt = new ComCrypto(client_certdb_dir, diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java index 5fad4790e..092658b50 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java @@ -31,13 +31,13 @@ import org.mozilla.jss.asn1.SEQUENCE; import org.mozilla.jss.pkcs12.AuthenticatedSafes; import org.mozilla.jss.pkcs12.PFX; -import com.netscape.osutil.OSUtil; import com.netscape.pkisilent.argparser.ArgParser; import com.netscape.pkisilent.argparser.StringHolder; import com.netscape.pkisilent.common.ComCrypto; import com.netscape.pkisilent.common.ParseXML; import com.netscape.pkisilent.http.HTTPClient; import com.netscape.pkisilent.http.HTTPResponse; +import com.netscape.cmsutil.util.Utils; public class ConfigureTKS { @@ -643,7 +643,7 @@ public class ConfigureTKS { // String cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = - OSUtil.BtoA(hr.getResponseData()); + Utils.base64encode(hr.getResponseData()); System.out.println("Imported Cert=" + cert_to_import); ComCrypto cCrypt = new ComCrypto(client_certdb_dir, diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java index 4982a2f2d..d4df34a39 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java @@ -21,13 +21,13 @@ package com.netscape.pkisilent; import java.io.ByteArrayInputStream; import java.net.URLEncoder; -import com.netscape.osutil.OSUtil; import com.netscape.pkisilent.argparser.ArgParser; import com.netscape.pkisilent.argparser.StringHolder; import com.netscape.pkisilent.common.ComCrypto; import com.netscape.pkisilent.common.ParseXML; import com.netscape.pkisilent.http.HTTPClient; import com.netscape.pkisilent.http.HTTPResponse; +import com.netscape.cmsutil.util.Utils; public class ConfigureTPS { // define global variables @@ -639,7 +639,7 @@ public class ConfigureTPS { // cert_to_import = // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); cert_to_import = - OSUtil.BtoA(hr.getResponseData()); + Utils.base64encode(hr.getResponseData()); } catch (Exception e) { System.out.println("ERROR: failed to retrieve cert"); diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java b/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java index 1c10db8fb..d629030f2 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/ComCrypto.java @@ -58,8 +58,7 @@ import org.mozilla.jss.pkix.primitive.AlgorithmIdentifier; import org.mozilla.jss.pkix.primitive.Name; import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; import org.mozilla.jss.util.Password; - -import com.netscape.osutil.OSUtil; +import com.netscape.cmsutil.util.Utils; /** * CMS Test framework . @@ -586,7 +585,7 @@ public class ComCrypto { // BASE64Encoder encoder = new BASE64Encoder(); // String Req1 = encoder.encodeBuffer(encoded); - String Req1 = OSUtil.BtoA(encoded); + String Req1 = Utils.base64encode(encoded); // Set CRMF_REQUEST variable CRMF_REQUEST = Req1; @@ -661,7 +660,7 @@ public class ComCrypto { // wrap private key // BASE64Decoder decoder = new BASE64Decoder(); // byte transport[] = decoder.decodeBuffer(transportcert); - byte transport[] = OSUtil.AtoB(transportcert); + byte transport[] = Utils.base64decode(transportcert); X509Certificate tcert = manager.importCACertPackage(transport); @@ -749,7 +748,7 @@ public class ComCrypto { // BASE64Encoder encoder = new BASE64Encoder(); // CRMF_REQUEST = encoder.encodeBuffer(encoded); - CRMF_REQUEST = OSUtil.BtoA(encoded); + CRMF_REQUEST = Utils.base64encode(encoded); System.out.println("Generated crmf request: ...... "); System.out.println(""); diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java b/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java index bf5db5043..b6ab3fe8c 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/PostQuery.java @@ -27,7 +27,7 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; -import com.netscape.osutil.OSUtil; +import com.netscape.cmsutil.util.Utils; /** * CMS Test framework . @@ -91,7 +91,7 @@ public class PostQuery { System.out.println("adminpwd=" + adminPWD); // String encoding = new sun.misc.BASE64Encoder().encode( // userPassword.getBytes()); - String encoding = OSUtil.BtoA( + String encoding = Utils.base64encode( userPassword.getBytes()); HttpURLConnection URLCon = (HttpURLConnection) myUrl.openConnection(); diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/Utilities.java b/pki/base/silent/src/com/netscape/pkisilent/common/Utilities.java index 9aaf6c4d9..3e5d6fb4c 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/Utilities.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/Utilities.java @@ -29,7 +29,7 @@ import netscape.security.x509.X500Name; import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509CertInfo; -import com.netscape.osutil.OSUtil; +import com.netscape.cmsutil.util.Utils; public class Utilities { @@ -305,7 +305,7 @@ public class Utilities { try { // BASE64Decoder base64 = new BASE64Decoder(); // byte decodedBASE64Cert[] = base64.decodeBuffer(temp); - byte decodedBASE64Cert[] = OSUtil.AtoB(temp); + byte decodedBASE64Cert[] = Utils.base64decode(temp); X509CertImpl x509_cert = new X509CertImpl(decodedBASE64Cert); X509CertInfo certinfo = (X509CertInfo) x509_cert.get("x509.INFO"); diff --git a/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java b/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java index e2d6b0644..c9584463d 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java +++ b/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java @@ -38,10 +38,10 @@ import org.mozilla.jss.ssl.SSLSocket; import org.mozilla.jss.ssl.TestCertApprovalCallback; import org.mozilla.jss.ssl.TestClientCertificateSelectionCallback; -import com.netscape.osutil.OSUtil; import com.netscape.pkisilent.argparser.ArgParser; import com.netscape.pkisilent.argparser.StringHolder; import com.netscape.pkisilent.common.ComCrypto; +import com.netscape.cmsutil.util.Utils; public class HTTPClient implements SSLCertificateApprovalCallback { @@ -1168,8 +1168,8 @@ public class HTTPClient implements SSLCertificateApprovalCallback { // String temp = encoder.encodeBuffer((user_id + // ":" + user_password).getBytes()); - String temp = OSUtil.BtoA((user_id + - ":" + user_password).getBytes()); + String temp = Utils.base64encode((user_id + + ":" + user_password).getBytes()); // note: temp already contains \r and \n. // remove \r and \n from the base64 encoded string. |