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/base/util | |
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/base/util')
-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 |
2 files changed, 8 insertions, 6 deletions
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 { |