diff options
Diffstat (limited to 'pki/base/java-tools')
3 files changed, 1 insertions, 15 deletions
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java index 7aa83dee9..7298fd2b3 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java @@ -288,16 +288,13 @@ public class CMCEnroll { ByteArrayOutputStream bs = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(bs); - if (fullEnrollmentReq != null) { + { // format is PR_REQUEST_CMC ByteArrayOutputStream os = new ByteArrayOutputStream(); fullEnrollmentReq.encode(os); ps.print(com.netscape.osutil.OSUtil.BtoA(os.toByteArray())); //fullEnrollmentReq.print(ps); // no header/trailer - } else { - // format is PR_REQUEST_PKCS10 - pkcs.print(ps); } asciiBASE64Blob = bs.toString(); } catch (Exception e) { diff --git a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java index d92792253..625532330 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java @@ -1632,14 +1632,6 @@ public class DRMTool // the BINARY BASE 64 byte[] object try { cert = new X509CertImpl( decodedBASE64Cert ); - if( cert == null ) { - log( "ERROR: Unable to parse " - + "certificate from '" - + mTargetStorageCertificateFilename - + "'." - + NEWLINE, true ); - System.exit( 0 ); - } } catch( CertificateException exWrapCertificate ) { log( "ERROR: Error encountered " + "in parsing certificate in '" diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java index 05b0acf9d..5f0999119 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java @@ -102,9 +102,6 @@ public class PKCS10Client dbdir = "."; try { - // initialize CryptoManager - if (dbdir == null) - dbdir = "."; String mPrefix = ""; CryptoManager.InitializationValues vals = new CryptoManager.InitializationValues(dbdir, mPrefix, |