diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-08-18 01:52:15 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-08-18 01:52:15 +0000 |
commit | e6e6b5146ef99c1b826e7420581f4a17ea37dacb (patch) | |
tree | 954d8aecfa2245273c3159dfafa50556d74f4d94 /pki/base/util | |
parent | 16b60483367f27632405ca18f8808e121f8e4f0c (diff) | |
download | pki-e6e6b5146ef99c1b826e7420581f4a17ea37dacb.tar.gz pki-e6e6b5146ef99c1b826e7420581f4a17ea37dacb.tar.xz pki-e6e6b5146ef99c1b826e7420581f4a17ea37dacb.zip |
Bugzilla Bug #224945 - javadocs has missing descriptions, contains empty packages (Fixed compilation issues of attachment #439031).
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1209 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/util')
-rw-r--r-- | pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java | 14 | ||||
-rw-r--r-- | pki/base/util/src/com/netscape/cmsutil/util/Cert.java | 13 |
2 files changed, 16 insertions, 11 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 720c97740..177affad2 100644 --- a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java +++ b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java @@ -33,8 +33,8 @@ import java.security.interfaces.DSAPublicKey; import java.security.interfaces.DSAParams; import java.security.cert.*; -import sun.misc.BASE64Encoder; -import sun.misc.BASE64Decoder; +//import sun.misc.BASE64Encoder; +//import sun.misc.BASE64Decoder; import org.mozilla.jss.*; import org.mozilla.jss.asn1.*; import org.mozilla.jss.util.*; @@ -68,12 +68,13 @@ public class CryptoUtil { /* * encodes cert */ - private static BASE64Encoder mEncoder = new BASE64Encoder(); + // private static BASE64Encoder mEncoder = new BASE64Encoder(); public static String toMIME64(X509CertImpl cert) { try { return "-----BEGIN CERTIFICATE-----\n" - + mEncoder.encodeBuffer(cert.getEncoded()) + // + mEncoder.encodeBuffer(cert.getEncoded()) + + com.netscape.osutil.OSUtil.BtoA( cert.getEncoded() ) + "-----END CERTIFICATE-----\n"; } catch (Exception e) {} return null; @@ -198,8 +199,9 @@ public class CryptoUtil { } public static byte[] base64Decode(String s) throws IOException { - BASE64Decoder base64 = new BASE64Decoder(); - byte[] d = base64.decodeBuffer(s); + // BASE64Decoder base64 = new BASE64Decoder(); + // byte[] d = base64.decodeBuffer(s); + byte[] d = com.netscape.osutil.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 f427d57ad..9e417b902 100644 --- a/pki/base/util/src/com/netscape/cmsutil/util/Cert.java +++ b/pki/base/util/src/com/netscape/cmsutil/util/Cert.java @@ -22,7 +22,7 @@ import netscape.security.pkcs.PKCS7; import netscape.security.x509.X509CRLImpl; import netscape.security.x509.X509CertImpl; import org.mozilla.jss.crypto.SignatureAlgorithm; -import sun.misc.BASE64Decoder; +//import sun.misc.BASE64Decoder; import java.io.IOException; import java.security.cert.CertificateException; @@ -89,12 +89,13 @@ public class Cert { return stripBrackets(s); } - private static BASE64Decoder mDecoder = new BASE64Decoder(); + // private static BASE64Decoder mDecoder = new BASE64Decoder(); public static X509CertImpl mapCert(String mime64) throws IOException { mime64 = stripCertBrackets(mime64.trim()); String newval = normalizeCertStr(mime64); - byte rawPub[] = mDecoder.decodeBuffer(newval); + // byte rawPub[] = mDecoder.decodeBuffer(newval); + byte rawPub[] = com.netscape.osutil.OSUtil.AtoB( newval ); X509CertImpl cert = null; try { @@ -108,7 +109,8 @@ public class Cert { throws IOException { mime64 = stripCertBrackets(mime64.trim()); String newval = normalizeCertStr(mime64); - byte rawPub[] = mDecoder.decodeBuffer(newval); + // byte rawPub[] = mDecoder.decodeBuffer(newval); + byte rawPub[] = com.netscape.osutil.OSUtil.AtoB( newval ); PKCS7 p7 = null; try { @@ -123,7 +125,8 @@ public class Cert { throws IOException { mime64 = stripCRLBrackets(mime64.trim()); String newval = normalizeCertStr(mime64); - byte rawPub[] = mDecoder.decodeBuffer(newval); + // byte rawPub[] = mDecoder.decodeBuffer(newval); + byte rawPub[] = com.netscape.osutil.OSUtil.AtoB( newval ); X509CRL crl = null; try { |