diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-13 21:30:52 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-01-13 21:30:52 +0000 |
commit | 512ee28022fac62414a4b1b20338359eefb08daa (patch) | |
tree | 6da1a90293eaefe65392109007d1d96895fb77cb /pki | |
parent | 91b9a5774f3e537de1ab0a176f52ba1fd2b91350 (diff) | |
download | pki-512ee28022fac62414a4b1b20338359eefb08daa.tar.gz pki-512ee28022fac62414a4b1b20338359eefb08daa.tar.xz pki-512ee28022fac62414a4b1b20338359eefb08daa.zip |
Bugzilla Bug #642741 - CS build uses deprecated functions
- removed references to "sun.misc.BASE64Encoder"
- removed references to "sun.misc.BASE64Decoder"
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1731 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki')
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java | 5 | ||||
-rw-r--r-- | pki/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java | 9 | ||||
-rw-r--r-- | pki/base/silent/src/ca/ConfigureCA.java | 8 | ||||
-rw-r--r-- | pki/base/silent/src/common/ComCrypto.java | 20 | ||||
-rw-r--r-- | pki/base/silent/src/common/PostQuery.java | 5 | ||||
-rw-r--r-- | pki/base/silent/src/common/Utilities.java | 6 | ||||
-rw-r--r-- | pki/base/silent/src/drm/ConfigureDRM.java | 6 | ||||
-rw-r--r-- | pki/base/silent/src/http/HTTPClient.java | 13 | ||||
-rw-r--r-- | pki/base/silent/src/ocsp/ConfigureOCSP.java | 6 | ||||
-rw-r--r-- | pki/base/silent/src/ra/ConfigureRA.java | 6 | ||||
-rw-r--r-- | pki/base/silent/src/subca/ConfigureSubCA.java | 6 | ||||
-rw-r--r-- | pki/base/silent/src/tks/ConfigureTKS.java | 6 | ||||
-rw-r--r-- | pki/base/silent/src/tps/ConfigureTPS.java | 6 | ||||
-rw-r--r-- | pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java | 5 | ||||
-rw-r--r-- | pki/base/util/src/com/netscape/cmsutil/util/Cert.java | 9 |
15 files changed, 74 insertions, 42 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java index 462525859..7bac528e9 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java @@ -898,8 +898,9 @@ public class ACLAdminServlet extends AdminServlet { ACL acl = AccessManager.getInstance().getACL(target); oos.writeObject(acl); } - BASE64Encoder encoder = new BASE64Encoder(); - params.add(Constants.PT_ACLS, encoder.encodeBuffer(bos.toByteArray())); + // BASE64Encoder encoder = new BASE64Encoder(); + // params.add(Constants.PT_ACLS, encoder.encodeBuffer(bos.toByteArray())); + params.add(Constants.PT_ACLS, CMS.BtoA(bos.toByteArray())); sendResponse(SUCCESS, null, params, resp); } */ diff --git a/pki/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java b/pki/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java index c7dc952c0..fac27f31d 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java @@ -27,6 +27,8 @@ import com.netscape.management.client.util.*; import com.netscape.management.client.*; import com.netscape.management.client.preferences.*; +import com.netscape.osutil.OSUtil; + /** * This class represents an administration connection shell * to the certificate server. The user need to specify the @@ -706,9 +708,12 @@ public class AdminConnection { if (mAuthType.equals("") || mAuthType.equals("pwd")) { BasicAuthenticator auth = (BasicAuthenticator)mAuth; - sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder(); + // sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder(); + // sb.append("Authorization: Basic " + + // encoder.encodeBuffer((auth.getUserid() + + // ":" + auth.getPassword()).getBytes()) + "\n"); sb.append("Authorization: Basic " + - encoder.encodeBuffer((auth.getUserid() + + OSUtil.BtoA((auth.getUserid() + ":" + auth.getPassword()).getBytes()) + "\n"); } else if (mAuthType.equals("sslclientauth")) { sb.append("\n"); diff --git a/pki/base/silent/src/ca/ConfigureCA.java b/pki/base/silent/src/ca/ConfigureCA.java index 01b6c29a1..f1fb63f9c 100644 --- a/pki/base/silent/src/ca/ConfigureCA.java +++ b/pki/base/silent/src/ca/ConfigureCA.java @@ -45,7 +45,7 @@ import netscape.security.x509.X500Name; import com.netscape.cmsutil.ocsp.*; import com.netscape.cmsutil.ocsp.Request; -import com.netscape.osutil.*; +import com.netscape.osutil.OSUtil; public class ConfigureCA { @@ -1087,10 +1087,10 @@ public class ConfigureCA { try { // get response data - // cert_to_import = OSUtil.BtoA(hr.getResponseData()); // Convert a byte array to base64 string - cert_to_import = new sun.misc.BASE64Encoder().encode( - hr.getResponseData()); + // cert_to_import = new sun.misc.BASE64Encoder().encode( + // hr.getResponseData()); + cert_to_import = OSUtil.BtoA(hr.getResponseData()); // Convert base64 string to a byte array // buf = new sun.misc.BASE64Decoder().decodeBuffer(s); diff --git a/pki/base/silent/src/common/ComCrypto.java b/pki/base/silent/src/common/ComCrypto.java index 229a64bf9..f501f7156 100644 --- a/pki/base/silent/src/common/ComCrypto.java +++ b/pki/base/silent/src/common/ComCrypto.java @@ -54,9 +54,10 @@ import netscape.security.x509.X500Name; import netscape.security.util.BigInt; import netscape.security.x509.X500Signer; -import sun.misc.BASE64Encoder; -import sun.misc.BASE64Decoder; +//import sun.misc.BASE64Encoder; +//import sun.misc.BASE64Decoder; import java.security.Signature; +import com.netscape.osutil.OSUtil; /** @@ -596,8 +597,9 @@ public class ComCrypto { byte encoded[] = ASN1Util.encode(s1); - BASE64Encoder encoder = new BASE64Encoder(); - String Req1 = encoder.encodeBuffer(encoded); + // BASE64Encoder encoder = new BASE64Encoder(); + // String Req1 = encoder.encodeBuffer(encoded); + String Req1 = OSUtil.BtoA(encoded); // Set CRMF_REQUEST variable CRMF_REQUEST = Req1; @@ -673,8 +675,9 @@ public class ComCrypto { pair = kg.genKeyPair(); // wrap private key - BASE64Decoder decoder = new BASE64Decoder(); - byte transport[] = decoder.decodeBuffer(transportcert); + // BASE64Decoder decoder = new BASE64Decoder(); + // byte transport[] = decoder.decodeBuffer(transportcert); + byte transport[] = OSUtil.AtoB(transportcert); X509Certificate tcert = manager.importCACertPackage(transport); @@ -759,9 +762,10 @@ public class ComCrypto { byte encoded[] = ASN1Util.encode(s1); - BASE64Encoder encoder = new BASE64Encoder(); + // BASE64Encoder encoder = new BASE64Encoder(); - CRMF_REQUEST = encoder.encodeBuffer(encoded); + // CRMF_REQUEST = encoder.encodeBuffer(encoded); + CRMF_REQUEST = OSUtil.BtoA(encoded); System.out.println("Generated crmf request: ...... "); System.out.println(""); diff --git a/pki/base/silent/src/common/PostQuery.java b/pki/base/silent/src/common/PostQuery.java index 378eeeef6..b8ab7505a 100644 --- a/pki/base/silent/src/common/PostQuery.java +++ b/pki/base/silent/src/common/PostQuery.java @@ -20,6 +20,7 @@ import java.net.*; import java.io.*; import java.util.*; +import com.netscape.osutil.OSUtil; /** * CMS Test framework . @@ -81,7 +82,9 @@ public class PostQuery { System.out.println("adminid=" + adminID); System.out.println("adminpwd=" + adminPWD); - String encoding = new sun.misc.BASE64Encoder().encode( + // String encoding = new sun.misc.BASE64Encoder().encode( + // userPassword.getBytes()); + String encoding = OSUtil.BtoA( userPassword.getBytes()); HttpURLConnection URLCon = (HttpURLConnection) myUrl.openConnection(); diff --git a/pki/base/silent/src/common/Utilities.java b/pki/base/silent/src/common/Utilities.java index 648fbb34d..444d9b6bf 100644 --- a/pki/base/silent/src/common/Utilities.java +++ b/pki/base/silent/src/common/Utilities.java @@ -26,6 +26,7 @@ import sun.misc.*; import netscape.security.x509.*; import netscape.security.util.*; +import com.netscape.osutil.OSUtil; public class Utilities { private static final String keyValueSeparators = "=: \t\r\n\f"; @@ -303,8 +304,9 @@ public class Utilities { temp = temp.replaceAll("\\n", ""); try { - BASE64Decoder base64 = new BASE64Decoder(); - byte decodedBASE64Cert[] = base64.decodeBuffer(temp); + // BASE64Decoder base64 = new BASE64Decoder(); + // byte decodedBASE64Cert[] = base64.decodeBuffer(temp); + byte decodedBASE64Cert[] = OSUtil.AtoB(temp); X509CertImpl x509_cert = new X509CertImpl(decodedBASE64Cert); X509CertInfo certinfo = (X509CertInfo) x509_cert.get("x509.INFO"); diff --git a/pki/base/silent/src/drm/ConfigureDRM.java b/pki/base/silent/src/drm/ConfigureDRM.java index 077313dce..fb9f112ce 100644 --- a/pki/base/silent/src/drm/ConfigureDRM.java +++ b/pki/base/silent/src/drm/ConfigureDRM.java @@ -42,7 +42,7 @@ import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509Key; import netscape.security.x509.X500Name; -import com.netscape.osutil.*; +import com.netscape.osutil.OSUtil; public class ConfigureDRM { @@ -824,8 +824,10 @@ public class ConfigureDRM hr = hc.sslConnect(sd_hostname,sd_admin_port,admin_uri,query_string); // get response data + // String cert_to_import = + // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = - new sun.misc.BASE64Encoder().encode(hr.getResponseData()); + OSUtil.BtoA(hr.getResponseData()); System.out.println("Imported Cert=" + cert_to_import); ComCrypto cCrypt = new ComCrypto(client_certdb_dir, diff --git a/pki/base/silent/src/http/HTTPClient.java b/pki/base/silent/src/http/HTTPClient.java index 840999080..5633cb448 100644 --- a/pki/base/silent/src/http/HTTPClient.java +++ b/pki/base/silent/src/http/HTTPClient.java @@ -22,8 +22,9 @@ import java.nio.*; import java.util.*; import java.net.URLEncoder; -import sun.misc.BASE64Encoder; -import sun.misc.BASE64Decoder; +//import sun.misc.BASE64Encoder; +//import sun.misc.BASE64Decoder; +import com.netscape.osutil.OSUtil; import org.mozilla.jss.*; @@ -1322,10 +1323,12 @@ public class HTTPClient implements SSLCertificateApprovalCallback // set basic auth if needed if(auth_type != null && auth_type.equalsIgnoreCase("BASIC")) { - BASE64Encoder encoder = new BASE64Encoder(); + // BASE64Encoder encoder = new BASE64Encoder(); - String temp = encoder.encodeBuffer((user_id + - ":" + user_password).getBytes()); + // String temp = encoder.encodeBuffer((user_id + + // ":" + user_password).getBytes()); + String temp = OSUtil.BtoA((user_id + + ":" + user_password).getBytes()); // note: temp already contains \r and \n. // remove \r and \n from the base64 encoded string. diff --git a/pki/base/silent/src/ocsp/ConfigureOCSP.java b/pki/base/silent/src/ocsp/ConfigureOCSP.java index 35f0fc01e..ad23c70ee 100644 --- a/pki/base/silent/src/ocsp/ConfigureOCSP.java +++ b/pki/base/silent/src/ocsp/ConfigureOCSP.java @@ -42,7 +42,7 @@ import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509Key; import netscape.security.x509.X500Name; -import com.netscape.osutil.*; +import com.netscape.osutil.OSUtil; public class ConfigureOCSP { @@ -728,8 +728,10 @@ public class ConfigureOCSP hr = hc.sslConnect(sd_hostname,sd_admin_port,admin_uri,query_string); // get response data + // String cert_to_import = + // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = - new sun.misc.BASE64Encoder().encode(hr.getResponseData()); + OSUtil.BtoA(hr.getResponseData()); System.out.println("Imported Cert=" + cert_to_import); ComCrypto cCrypt = new ComCrypto(client_certdb_dir, diff --git a/pki/base/silent/src/ra/ConfigureRA.java b/pki/base/silent/src/ra/ConfigureRA.java index 43ade27b4..8e976ab10 100644 --- a/pki/base/silent/src/ra/ConfigureRA.java +++ b/pki/base/silent/src/ra/ConfigureRA.java @@ -42,7 +42,7 @@ import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509Key; import netscape.security.x509.X500Name; -import com.netscape.osutil.*; +import com.netscape.osutil.OSUtil; public class ConfigureRA { @@ -582,8 +582,10 @@ public class ConfigureRA try { + // cert_to_import = + // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); cert_to_import = - new sun.misc.BASE64Encoder().encode(hr.getResponseData()); + OSUtil.BtoA(hr.getResponseData()); } catch (Exception e) diff --git a/pki/base/silent/src/subca/ConfigureSubCA.java b/pki/base/silent/src/subca/ConfigureSubCA.java index b82ae467a..111879bb5 100644 --- a/pki/base/silent/src/subca/ConfigureSubCA.java +++ b/pki/base/silent/src/subca/ConfigureSubCA.java @@ -42,7 +42,7 @@ import netscape.security.x509.X500Name; import com.netscape.cmsutil.ocsp.*; import com.netscape.cmsutil.ocsp.Request; -import com.netscape.osutil.*; +import com.netscape.osutil.OSUtil; public class ConfigureSubCA { @@ -769,8 +769,10 @@ public class ConfigureSubCA hr = hc.sslConnect(cs_hostname,cs_port,admin_uri,query_string); // get response data + // String cert_to_import = + // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = - new sun.misc.BASE64Encoder().encode(hr.getResponseData()); + OSUtil.BtoA(hr.getResponseData()); System.out.println("Imported Cert=" + cert_to_import); ComCrypto cCrypt = new ComCrypto(client_certdb_dir, diff --git a/pki/base/silent/src/tks/ConfigureTKS.java b/pki/base/silent/src/tks/ConfigureTKS.java index c91d55abf..25242dfd3 100644 --- a/pki/base/silent/src/tks/ConfigureTKS.java +++ b/pki/base/silent/src/tks/ConfigureTKS.java @@ -42,7 +42,7 @@ import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509Key; import netscape.security.x509.X500Name; -import com.netscape.osutil.*; +import com.netscape.osutil.OSUtil; public class ConfigureTKS { @@ -696,8 +696,10 @@ public class ConfigureTKS hr = hc.sslConnect(sd_hostname,sd_admin_port,admin_uri,query_string); // get response data + // String cert_to_import = + // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); String cert_to_import = - new sun.misc.BASE64Encoder().encode(hr.getResponseData()); + OSUtil.BtoA(hr.getResponseData()); System.out.println("Imported Cert=" + cert_to_import); ComCrypto cCrypt = new ComCrypto(client_certdb_dir, diff --git a/pki/base/silent/src/tps/ConfigureTPS.java b/pki/base/silent/src/tps/ConfigureTPS.java index c783923b7..2f052e7ad 100644 --- a/pki/base/silent/src/tps/ConfigureTPS.java +++ b/pki/base/silent/src/tps/ConfigureTPS.java @@ -42,7 +42,7 @@ import netscape.security.x509.X509CertImpl; import netscape.security.x509.X509Key; import netscape.security.x509.X500Name; -import com.netscape.osutil.*; +import com.netscape.osutil.OSUtil; public class ConfigureTPS { @@ -715,8 +715,10 @@ public class ConfigureTPS try { + // cert_to_import = + // new sun.misc.BASE64Encoder().encode(hr.getResponseData()); cert_to_import = - new sun.misc.BASE64Encoder().encode(hr.getResponseData()); + OSUtil.BtoA(hr.getResponseData()); } catch (Exception e) diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java index 1b2a2bdf1..0083dc92d 100644 --- a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java +++ b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java @@ -56,6 +56,7 @@ import netscape.security.pkcs.*; import netscape.security.x509.*; import com.netscape.cmsutil.util.Cert; +import com.netscape.osutil.OSUtil; public class CryptoUtil { @@ -74,7 +75,7 @@ public class CryptoUtil { return "-----BEGIN CERTIFICATE-----\n" // + mEncoder.encodeBuffer(cert.getEncoded()) - + com.netscape.osutil.OSUtil.BtoA( cert.getEncoded() ) + + OSUtil.BtoA( cert.getEncoded() ) + "-----END CERTIFICATE-----\n"; } catch (Exception e) {} return null; @@ -261,7 +262,7 @@ public class CryptoUtil { public static byte[] base64Decode(String s) throws IOException { // BASE64Decoder base64 = new BASE64Decoder(); // byte[] d = base64.decodeBuffer(s); - byte[] d = com.netscape.osutil.OSUtil.AtoB( s ); + byte[] d = OSUtil.AtoB( s ); return d; } diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Cert.java b/pki/base/util/src/com/netscape/cmsutil/util/Cert.java index 9e417b902..6a2d32b32 100644 --- a/pki/base/util/src/com/netscape/cmsutil/util/Cert.java +++ b/pki/base/util/src/com/netscape/cmsutil/util/Cert.java @@ -23,6 +23,7 @@ import netscape.security.x509.X509CRLImpl; import netscape.security.x509.X509CertImpl; import org.mozilla.jss.crypto.SignatureAlgorithm; //import sun.misc.BASE64Decoder; +import com.netscape.osutil.OSUtil; import java.io.IOException; import java.security.cert.CertificateException; @@ -95,7 +96,7 @@ public class Cert { mime64 = stripCertBrackets(mime64.trim()); String newval = normalizeCertStr(mime64); // byte rawPub[] = mDecoder.decodeBuffer(newval); - byte rawPub[] = com.netscape.osutil.OSUtil.AtoB( newval ); + byte rawPub[] = OSUtil.AtoB( newval ); X509CertImpl cert = null; try { @@ -110,7 +111,7 @@ public class Cert { mime64 = stripCertBrackets(mime64.trim()); String newval = normalizeCertStr(mime64); // byte rawPub[] = mDecoder.decodeBuffer(newval); - byte rawPub[] = com.netscape.osutil.OSUtil.AtoB( newval ); + byte rawPub[] = OSUtil.AtoB( newval ); PKCS7 p7 = null; try { @@ -126,7 +127,7 @@ public class Cert { mime64 = stripCRLBrackets(mime64.trim()); String newval = normalizeCertStr(mime64); // byte rawPub[] = mDecoder.decodeBuffer(newval); - byte rawPub[] = com.netscape.osutil.OSUtil.AtoB( newval ); + byte rawPub[] = OSUtil.AtoB( newval ); X509CRL crl = null; try { @@ -140,7 +141,7 @@ public class Cert { throws IOException { mime64 = stripCRLBrackets(mime64.trim()); - byte rawPub[] = com.netscape.osutil.OSUtil.AtoB(mime64); + byte rawPub[] = OSUtil.AtoB(mime64); X509CRL crl = null; try { |