diff options
Diffstat (limited to 'base/java-tools/src/com/netscape/cmstools/pkcs12')
4 files changed, 13 insertions, 13 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertCLI.java index f4d97cd74..a83fbac4f 100644 --- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertCLI.java @@ -21,7 +21,7 @@ package com.netscape.cmstools.pkcs12; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.cmstools.cli.CLI; -import netscape.security.pkcs.PKCS12Util.PKCS12CertInfo; +import netscape.security.pkcs.PKCS12CertInfo; /** * @author Endi S. Dewata @@ -35,13 +35,13 @@ public class PKCS12CertCLI extends CLI { } public static void printCertInfo(PKCS12CertInfo certInfo) throws Exception { - System.out.println(" Serial Number: " + new CertId(certInfo.cert.getSerialNumber()).toHexString()); - System.out.println(" Nickname: " + certInfo.nickname); - System.out.println(" Subject DN: " + certInfo.cert.getSubjectDN()); - System.out.println(" Issuer DN: " + certInfo.cert.getIssuerDN()); + System.out.println(" Serial Number: " + new CertId(certInfo.getCert().getSerialNumber()).toHexString()); + System.out.println(" Nickname: " + certInfo.getNickname()); + System.out.println(" Subject DN: " + certInfo.getCert().getSubjectDN()); + System.out.println(" Issuer DN: " + certInfo.getCert().getIssuerDN()); - if (certInfo.trustFlags != null) { - System.out.println(" Trust flags: " + certInfo.trustFlags); + if (certInfo.getTrustFlags() != null) { + System.out.println(" Trust flags: " + certInfo.getTrustFlags()); } } } diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertFindCLI.java index 4cbfee518..3aec7a6b2 100644 --- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12CertFindCLI.java @@ -29,8 +29,8 @@ import org.apache.commons.cli.ParseException; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; +import netscape.security.pkcs.PKCS12CertInfo; import netscape.security.pkcs.PKCS12Util; -import netscape.security.pkcs.PKCS12Util.PKCS12CertInfo; /** * @author Endi S. Dewata diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyCLI.java index 9f0779782..d859fcea1 100644 --- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyCLI.java @@ -20,7 +20,7 @@ package com.netscape.cmstools.pkcs12; import com.netscape.cmstools.cli.CLI; -import netscape.security.pkcs.PKCS12Util.PKCS12KeyInfo; +import netscape.security.pkcs.PKCS12KeyInfo; /** * @author Endi S. Dewata @@ -34,10 +34,10 @@ public class PKCS12KeyCLI extends CLI { } public static void printKeyInfo(PKCS12KeyInfo keyInfo) throws Exception { - System.out.println(" Subject DN: " + keyInfo.subjectDN); + System.out.println(" Subject DN: " + keyInfo.getSubjectDN()); - if (keyInfo.privateKeyInfo != null) { - System.out.println(" Algorithm: " + keyInfo.privateKeyInfo.getAlgorithm()); + if (keyInfo.getPrivateKeyInfo() != null) { + System.out.println(" Algorithm: " + keyInfo.getPrivateKeyInfo().getAlgorithm()); } } } diff --git a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyFindCLI.java b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyFindCLI.java index d8c165cd6..3bda750a4 100644 --- a/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/pkcs12/PKCS12KeyFindCLI.java @@ -32,8 +32,8 @@ import org.mozilla.jss.util.Password; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; +import netscape.security.pkcs.PKCS12KeyInfo; import netscape.security.pkcs.PKCS12Util; -import netscape.security.pkcs.PKCS12Util.PKCS12KeyInfo; /** * @author Endi S. Dewata |