diff options
Diffstat (limited to 'pki/base')
5 files changed, 17 insertions, 14 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java index 933fd607c..2b241696c 100644 --- a/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java +++ b/pki/base/common/src/com/netscape/certsrv/dbs/IDBSubsystem.java @@ -191,7 +191,6 @@ public interface IDBSubsystem extends ISubsystem { /** * Determines if serial number management has been enabled * - * @param repo repo identifier * @return true if enabled, false otherwise */ public boolean getEnableSerialMgmt(); diff --git a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java b/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java index 75dd7594a..f8c10e3dc 100644 --- a/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java +++ b/pki/base/common/src/com/netscape/certsrv/kra/IKeyService.java @@ -74,7 +74,6 @@ public interface IKeyService { * add approving agent in asynchronous key recovery * @param reqID request id * @param agentID agent id - * @return requestId * @exception EBaseException failed to initiate async recovery */ public void addAgentAsyncKeyRecovery(String reqID, String agentID) diff --git a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java b/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java index bf9e39524..496d93825 100644 --- a/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java +++ b/pki/base/common/src/com/netscape/certsrv/security/KeyCertData.java @@ -692,7 +692,7 @@ public class KeyCertData extends Properties { /** * Sets Authority Information Access flag * - * @param aki Authority Information Access flag + * @param aia Authority Information Access flag */ public void setAIA(String aia) { put(Constants.PR_AIA, aia); 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 { |