diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/crl')
11 files changed, 198 insertions, 223 deletions
diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java index 6fe802e7..19b6180d 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSAuthInfoAccessExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.IOException; import java.util.Locale; @@ -38,14 +37,13 @@ import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; - /** * This represents a Authority Information Access CRL extension. - * + * * @version $Revision$, $Date$ */ public class CMSAuthInfoAccessExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { public static final String PROP_NUM_ADS = "numberOfAccessDescriptions"; public static final String PROP_ACCESS_METHOD = "accessMethod"; public static final String PROP_ACCESS_LOCATION_TYPE = "accessLocationType"; @@ -62,7 +60,7 @@ public class CMSAuthInfoAccessExtension } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { AuthInfoAccessExtension authInfoAccessExt = (AuthInfoAccessExtension) ext; authInfoAccessExt.setCritical(critical); @@ -71,7 +69,7 @@ public class CMSAuthInfoAccessExtension } public Extension getCRLExtension(IConfigStore config, Object ip, - boolean critical) { + boolean critical) { ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; AuthInfoAccessExtension authInfoAccessExt = new AuthInfoAccessExtension(critical); @@ -138,7 +136,7 @@ public class CMSAuthInfoAccessExtension String hostname = CMS.getEENonSSLHost(); String port = CMS.getEENonSSLPort(); if (hostname != null && port != null) { - accessLocation = "http://"+hostname+":"+port+"/ca/ee/ca/getCAChain?op=downloadBIN"; + accessLocation = "http://" + hostname + ":" + port + "/ca/ee/ca/getCAChain?op=downloadBIN"; } URIName uriName = new URIName(accessLocation); authInfoAccessExt.addAccessDescription(AuthInfoAccessExtension.METHOD_CA_ISSUERS, new GeneralName(uriName)); @@ -211,7 +209,7 @@ public class CMSAuthInfoAccessExtension String hostname = CMS.getEENonSSLHost(); String port = CMS.getEENonSSLPort(); if (hostname != null && port != null) { - accessLocation = "http://"+hostname+":"+port+"/ca/ee/ca/getCAChain?op=downloadBIN"; + accessLocation = "http://" + hostname + ":" + port + "/ca/ee/ca/getCAChain?op=downloadBIN"; } nvp.add(PROP_ACCESS_LOCATION + i, accessLocation); } @@ -224,32 +222,32 @@ public class CMSAuthInfoAccessExtension "critical;boolean;Set criticality for Authority Information Access extension.", PROP_NUM_ADS + ";number;Set number of Access Descriptions.", PROP_ACCESS_METHOD + "0;choice(" + PROP_ACCESS_METHOD_CAISSUERS + "," + - PROP_ACCESS_METHOD_OCSP +");Select access description method.", + PROP_ACCESS_METHOD_OCSP + ");Select access description method.", PROP_ACCESS_LOCATION_TYPE + "0;choice(" + PROP_URINAME + "," + - PROP_DIRNAME + ");Select access location type.", + PROP_DIRNAME + ");Select access location type.", PROP_ACCESS_LOCATION + "0;string;Enter access location " + - "corresponding to the selected access location type.", + "corresponding to the selected access location type.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-authorityinformationaccess", + ";configuration-ca-edit-crlextension-authorityinformationaccess", PROP_ACCESS_METHOD + "1;choice(" + PROP_ACCESS_METHOD_CAISSUERS + "," + - PROP_ACCESS_METHOD_OCSP +");Select access description method.", + PROP_ACCESS_METHOD_OCSP + ");Select access description method.", PROP_ACCESS_LOCATION_TYPE + "1;choice(" + PROP_URINAME + "," + - PROP_DIRNAME + ");Select access location type.", + PROP_DIRNAME + ");Select access location type.", PROP_ACCESS_LOCATION + "1;string;Enter access location " + - "corresponding to the selected access location type.", + "corresponding to the selected access location type.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-authorityinformationaccess", + ";configuration-ca-edit-crlextension-authorityinformationaccess", PROP_ACCESS_METHOD + "2;choice(" + PROP_ACCESS_METHOD_CAISSUERS + "," + - PROP_ACCESS_METHOD_OCSP +");Select access description method.", + PROP_ACCESS_METHOD_OCSP + ");Select access description method.", PROP_ACCESS_LOCATION_TYPE + "2;choice(" + PROP_URINAME + "," + - PROP_DIRNAME + ");Select access location type.", + PROP_DIRNAME + ");Select access location type.", PROP_ACCESS_LOCATION + "2;string;Enter access location " + - "corresponding to the selected access location type.", + "corresponding to the selected access location type.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-authorityinformationaccess", + ";configuration-ca-edit-crlextension-authorityinformationaccess", IExtendedPluginInfo.HELP_TEXT + - ";The Freshest CRL is a non critical CRL extension " + - "that identifies the delta CRL distribution points for a particular CRL." + ";The Freshest CRL is a non critical CRL extension " + + "that identifies the delta CRL distribution points for a particular CRL." }; return params; @@ -257,6 +255,6 @@ public class CMSAuthInfoAccessExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSAuthInfoAccessExtension - " + msg); + "CMSAuthInfoAccessExtension - " + msg); } -} +} diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java index 4cdb0bdc..4981702a 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSAuthorityKeyIdentifierExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.IOException; import java.security.cert.CertificateException; import java.security.cert.CertificateParsingException; @@ -43,21 +42,20 @@ import com.netscape.certsrv.ca.ICertificateAuthority; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; - /** * This represents an authority key identifier extension. - * + * * @version $Revision$, $Date$ */ public class CMSAuthorityKeyIdentifierExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSAuthorityKeyIdentifierExtension() { } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { AuthorityKeyIdentifierExtension authKeyIdExt = null; KeyIdentifier keyId = null; GeneralNames names = null; @@ -78,8 +76,8 @@ public class CMSAuthorityKeyIdentifierExtension } public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + Object ip, + boolean critical) { AuthorityKeyIdentifierExtension authKeyIdExt = null; ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; @@ -88,12 +86,12 @@ public class CMSAuthorityKeyIdentifierExtension try { X509CertInfo info = (X509CertInfo) - ((ICertificateAuthority) crlIssuingPoint.getCertificateAuthority()).getCACert().get( - X509CertImpl.NAME + "." + X509CertImpl.INFO); + ((ICertificateAuthority) crlIssuingPoint.getCertificateAuthority()).getCACert().get( + X509CertImpl.NAME + "." + X509CertImpl.INFO); if (info != null) { - CertificateExtensions caCertExtensions = (CertificateExtensions) - info.get(X509CertInfo.EXTENSIONS); + CertificateExtensions caCertExtensions = (CertificateExtensions) + info.get(X509CertInfo.EXTENSIONS); if (caCertExtensions != null) { for (int i = 0; i < caCertExtensions.size(); i++) { @@ -101,7 +99,7 @@ public class CMSAuthorityKeyIdentifierExtension if (caCertExt instanceof SubjectKeyIdentifierExtension) { SubjectKeyIdentifierExtension id = - (SubjectKeyIdentifierExtension) caCertExt; + (SubjectKeyIdentifierExtension) caCertExt; keyId = (KeyIdentifier) id.get(SubjectKeyIdentifierExtension.KEY_ID); @@ -143,16 +141,16 @@ public class CMSAuthorityKeyIdentifierExtension public String[] getExtendedPluginInfo(Locale locale) { String[] params = { - //"type;choice(CRLExtension,CRLEntryExtension);CRL Extension Type. "+ - //"This field is not editable.", + // "type;choice(CRLExtension,CRLEntryExtension);CRL Extension Type. "+ + // "This field is not editable.", "enable;boolean;Check to enable Authority Key Identifier CRL extension.", "critical;boolean;Set criticality for Authority Key Identifier CRL extension.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-authoritykeyidentifier", + ";configuration-ca-edit-crlextension-authoritykeyidentifier", IExtendedPluginInfo.HELP_TEXT + - ";The authority key identifier extension provides a means " + - "of identifying the public key corresponding to the private " + - "key used to sign a CRL." + ";The authority key identifier extension provides a means " + + "of identifying the public key corresponding to the private " + + "key used to sign a CRL." }; return params; @@ -160,6 +158,6 @@ public class CMSAuthorityKeyIdentifierExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSAuthorityKeyIdentifierExtension - " + msg); + "CMSAuthorityKeyIdentifierExtension - " + msg); } -} +} diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java index e4bb4cb6..958a4d56 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSCRLNumberExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.IOException; import java.math.BigInteger; import java.util.Locale; @@ -34,21 +33,20 @@ import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; - /** * This represents a CRL number extension. - * + * * @version $Revision$, $Date$ */ public class CMSCRLNumberExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSCRLNumberExtension() { } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { BigInteger crlNumber = null; CRLNumberExtension crlNumberExt = null; @@ -64,8 +62,8 @@ public class CMSCRLNumberExtension } public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + Object ip, + boolean critical) { CRLNumberExtension crlNumberExt = null; ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; @@ -87,16 +85,16 @@ public class CMSCRLNumberExtension public String[] getExtendedPluginInfo(Locale locale) { String[] params = { - //"type;choice(CRLExtension,CRLEntryExtension);"+ - //"CRL Extension type. This field is not editable.", + // "type;choice(CRLExtension,CRLEntryExtension);"+ + // "CRL Extension type. This field is not editable.", "enable;boolean;Check to enable CRL Number extension.", "critical;boolean;Set criticality for CRL Number extension.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-crlnumber", + ";configuration-ca-edit-crlextension-crlnumber", IExtendedPluginInfo.HELP_TEXT + - ";The CRL number is a non-critical CRL extension " + - "which conveys a monotonically increasing sequence number " + - "for each CRL issued by a CA" + ";The CRL number is a non-critical CRL extension " + + "which conveys a monotonically increasing sequence number " + + "for each CRL issued by a CA" }; return params; @@ -104,6 +102,6 @@ public class CMSCRLNumberExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSCRLNumberExtension - " + msg); + "CMSCRLNumberExtension - " + msg); } -} +} diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java index 245428a6..614d672d 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSCRLReasonExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.IOException; import java.util.Locale; @@ -33,21 +32,20 @@ import com.netscape.certsrv.ca.ICMSCRLExtension; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; - /** * This represents a CRL reason extension. - * + * * @version $Revision$, $Date$ */ public class CMSCRLReasonExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSCRLReasonExtension() { } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { RevocationReason reason = null; CRLReasonExtension crlReasonExt = null; @@ -61,8 +59,8 @@ public class CMSCRLReasonExtension } public Extension getCRLExtension(IConfigStore config, - Object crlIssuingPoint, - boolean critical) { + Object crlIssuingPoint, + boolean critical) { CRLReasonExtension crlReasonExt = null; return crlReasonExt; @@ -77,15 +75,15 @@ public class CMSCRLReasonExtension public String[] getExtendedPluginInfo(Locale locale) { String[] params = { - //"type;choice(CRLExtension,CRLEntryExtension);"+ - //"CRL Entry Extension type. This field is not editable.", + // "type;choice(CRLExtension,CRLEntryExtension);"+ + // "CRL Entry Extension type. This field is not editable.", "enable;boolean;Check to enable reason code CRL entry extension.", "critical;boolean;Set criticality for reason code CRL entry extension.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-crlreason", + ";configuration-ca-edit-crlextension-crlreason", IExtendedPluginInfo.HELP_TEXT + - ";The CRL reason code is a non-critical CRL entry extension " + - "that identifies the reason for the certificate revocation." + ";The CRL reason code is a non-critical CRL entry extension " + + "that identifies the reason for the certificate revocation." }; return params; @@ -93,6 +91,6 @@ public class CMSCRLReasonExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSCRLReasonExtension - " + msg); + "CMSCRLReasonExtension - " + msg); } -} +} diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java index 601e15d2..4d8fc8b9 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSCertificateIssuerExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.IOException; import java.util.Locale; @@ -40,18 +39,18 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a certificate issuer extension. - * + * * @version $Revision$, $Date$ */ public class CMSCertificateIssuerExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSCertificateIssuerExtension() { } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { CertificateIssuerExtension certIssuerExt = null; GeneralNames names = null; @@ -67,8 +66,8 @@ public class CMSCertificateIssuerExtension } public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + Object ip, + boolean critical) { CertificateIssuerExtension certIssuerExt = null; int numNames = 0; @@ -195,8 +194,8 @@ public class CMSCertificateIssuerExtension public String[] getExtendedPluginInfo(Locale locale) { String[] params = { - //"type;choice(CRLExtension,CRLEntryExtension);CRL Entry Extension type."+ - //" This field is not editable.", + // "type;choice(CRLExtension,CRLEntryExtension);CRL Entry Extension type."+ + // " This field is not editable.", "enable;boolean;Check to enable Certificate Issuer CRL entry extension.", "critical;boolean;Set criticality for Certificate Issuer CRL entry extension.", "numNames;number;Set number of certificate issuer names for the CRL entry.", @@ -207,10 +206,10 @@ public class CMSCertificateIssuerExtension "nameType2;choice(DirectoryName,URI);Select Certificate Issuer name type.", "name2;string;Enter Certificate Issuer name corresponding to the selected name type.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-certificateissuer", + ";configuration-ca-edit-crlextension-certificateissuer", IExtendedPluginInfo.HELP_TEXT + - ";This CRL entry extension identifies the certificate issuer" + - " associated with an entry in an indirect CRL." + ";This CRL entry extension identifies the certificate issuer" + + " associated with an entry in an indirect CRL." }; return params; @@ -219,4 +218,4 @@ public class CMSCertificateIssuerExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, msg); } -} +} diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java index 35d21e5c..e3290c34 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSDeltaCRLIndicatorExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.IOException; import java.math.BigInteger; import java.util.Locale; @@ -34,21 +33,20 @@ import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; - /** * This represents a delta CRL indicator extension. - * + * * @version $Revision$, $Date$ */ public class CMSDeltaCRLIndicatorExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSDeltaCRLIndicatorExtension() { } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { BigInteger baseCRLNumber = null; DeltaCRLIndicatorExtension deltaCRLIndicatorExt = null; @@ -65,8 +63,8 @@ public class CMSDeltaCRLIndicatorExtension } public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + Object ip, + boolean critical) { DeltaCRLIndicatorExtension deltaCRLIndicatorExt = null; ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; @@ -89,15 +87,15 @@ public class CMSDeltaCRLIndicatorExtension public String[] getExtendedPluginInfo(Locale locale) { String[] params = { - //"type;choice(CRLExtension,CRLEntryExtension);"+ - //"CRL Extension type. This field is not editable.", + // "type;choice(CRLExtension,CRLEntryExtension);"+ + // "CRL Extension type. This field is not editable.", "enable;boolean;Check to enable Delta CRL Indicator extension.", "critical;boolean;Set criticality for Delta CRL Indicator extension.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-crlnumber", + ";configuration-ca-edit-crlextension-crlnumber", IExtendedPluginInfo.HELP_TEXT + - ";The Delta CRL Indicator is a critical CRL extension " + - "which identifies a delta-CRL." + ";The Delta CRL Indicator is a critical CRL extension " + + "which identifies a delta-CRL." }; return params; @@ -105,7 +103,6 @@ public class CMSDeltaCRLIndicatorExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSDeltaCRLIndicatorExtension - " + msg); + "CMSDeltaCRLIndicatorExtension - " + msg); } } - diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java index 86bdd05e..38eb7a1c 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSFreshestCRLExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.IOException; import java.util.Locale; @@ -40,14 +39,13 @@ import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; - /** * This represents a freshest CRL extension. - * + * * @version $Revision$, $Date$ */ public class CMSFreshestCRLExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { public static final String PROP_NUM_POINTS = "numPoints"; public static final String PROP_POINTTYPE = "pointType"; public static final String PROP_POINTNAME = "pointName"; @@ -60,7 +58,7 @@ public class CMSFreshestCRLExtension } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { FreshestCRLExtension freshestCRLExt = (FreshestCRLExtension) ext; freshestCRLExt.setCritical(critical); @@ -69,7 +67,7 @@ public class CMSFreshestCRLExtension } public Extension getCRLExtension(IConfigStore config, Object ip, - boolean critical) { + boolean critical) { ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; FreshestCRLExtension freshestCRLExt = null; @@ -159,7 +157,7 @@ public class CMSFreshestCRLExtension numPoints = config.getInteger(PROP_NUM_POINTS, 0); } catch (EBaseException e) { log(ILogger.LL_FAILURE, "Invalid numPoints property for CRL " + - "Freshest CRL extension - " + e); + "Freshest CRL extension - " + e); } nvp.add(PROP_NUM_POINTS, String.valueOf(numPoints)); @@ -204,26 +202,26 @@ public class CMSFreshestCRLExtension "critical;boolean;Set criticality for Freshest CRL extension.", PROP_NUM_POINTS + ";number;Set number of CRL distribution points.", PROP_POINTTYPE + "0;choice(" + PROP_DIRNAME + "," + PROP_URINAME + - ");Select CRL distribution point name type.", + ");Select CRL distribution point name type.", PROP_POINTNAME + "0;string;Enter CRL distribution point name " + - "corresponding to the selected point type.", + "corresponding to the selected point type.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-issuingdistributionpoint", + ";configuration-ca-edit-crlextension-issuingdistributionpoint", PROP_POINTTYPE + "1;choice(" + PROP_DIRNAME + "," + PROP_URINAME + - ");Select CRL distribution point name type.", + ");Select CRL distribution point name type.", PROP_POINTNAME + "1;string;Enter CRL distribution point name " + - "corresponding to the selected point type.", + "corresponding to the selected point type.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-issuingdistributionpoint", + ";configuration-ca-edit-crlextension-issuingdistributionpoint", PROP_POINTTYPE + "2;choice(" + PROP_DIRNAME + "," + PROP_URINAME + - ");Select CRL distribution point name type.", + ");Select CRL distribution point name type.", PROP_POINTNAME + "2;string;Enter CRL distribution point name " + - "corresponding to the selected point type.", + "corresponding to the selected point type.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-issuingdistributionpoint", + ";configuration-ca-edit-crlextension-issuingdistributionpoint", IExtendedPluginInfo.HELP_TEXT + - ";The Freshest CRL is a non critical CRL extension " + - "that identifies the delta CRL distribution points for a particular CRL." + ";The Freshest CRL is a non critical CRL extension " + + "that identifies the delta CRL distribution points for a particular CRL." }; return params; @@ -231,6 +229,6 @@ public class CMSFreshestCRLExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSFreshestCRLExtension - " + msg); + "CMSFreshestCRLExtension - " + msg); } -} +} diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java index e0e39b8a..04e5468d 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSHoldInstructionExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.IOException; import java.util.Locale; @@ -36,14 +35,13 @@ import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; - /** * This represents a hold instruction extension. - * + * * @version $Revision$, $Date$ */ public class CMSHoldInstructionExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { public static final String PROP_INSTR = "instruction"; public static final String PROP_INSTR_NONE = "none"; public static final String PROP_INSTR_CALLISSUER = "callissuer"; @@ -55,12 +53,12 @@ public class CMSHoldInstructionExtension } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { HoldInstructionExtension holdInstrExt = null; try { ObjectIdentifier holdInstr = - ((HoldInstructionExtension) ext).getHoldInstructionCode(); + ((HoldInstructionExtension) ext).getHoldInstructionCode(); holdInstrExt = new HoldInstructionExtension(Boolean.valueOf(critical), holdInstr); @@ -71,8 +69,8 @@ public class CMSHoldInstructionExtension } public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + Object ip, + boolean critical) { HoldInstructionExtension holdInstrExt = null; String instruction = null; @@ -121,8 +119,7 @@ public class CMSHoldInstructionExtension } if (instruction != null) { if (!(instruction.equalsIgnoreCase(PROP_INSTR_NONE) || - instruction.equalsIgnoreCase(PROP_INSTR_CALLISSUER) || - instruction.equalsIgnoreCase(PROP_INSTR_REJECT))) { + instruction.equalsIgnoreCase(PROP_INSTR_CALLISSUER) || instruction.equalsIgnoreCase(PROP_INSTR_REJECT))) { instruction = PROP_INSTR_NONE; } } else { @@ -133,19 +130,19 @@ public class CMSHoldInstructionExtension public String[] getExtendedPluginInfo(Locale locale) { String[] params = { - //"type;choice(CRLExtension,CRLEntryExtension);"+ - //"CRL Entry Extension type. This field is not editable.", + // "type;choice(CRLExtension,CRLEntryExtension);"+ + // "CRL Entry Extension type. This field is not editable.", "enable;boolean;Check to enable Hold Instruction CRL entry extension.", "critical;boolean;Set criticality for Hold Instruction CRL entry extension.", PROP_INSTR + ";choice(" + PROP_INSTR_NONE + "," + PROP_INSTR_CALLISSUER + "," + - PROP_INSTR_REJECT + ");Select hold instruction code.", + PROP_INSTR_REJECT + ");Select hold instruction code.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-holdinstruction", + ";configuration-ca-edit-crlextension-holdinstruction", IExtendedPluginInfo.HELP_TEXT + - ";The hold instruction code is a non-critical CRL entry " + - "extension that provides a registered instruction identifier " + - "which indicates the action to be taken after encountering " + - "a certificate that has been placed on hold." + ";The hold instruction code is a non-critical CRL entry " + + "extension that provides a registered instruction identifier " + + "which indicates the action to be taken after encountering " + + "a certificate that has been placed on hold." }; return params; @@ -153,6 +150,6 @@ public class CMSHoldInstructionExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSHoldInstructionExtension - " + msg); + "CMSHoldInstructionExtension - " + msg); } -} +} diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java index c0c62244..2f885262 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSInvalidityDateExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.IOException; import java.util.Date; import java.util.Locale; @@ -33,21 +32,20 @@ import com.netscape.certsrv.ca.ICMSCRLExtension; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; - /** * This represents a invalidity date extension. - * + * * @version $Revision$, $Date$ */ public class CMSInvalidityDateExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSInvalidityDateExtension() { } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { InvalidityDateExtension invalidityDateExt = null; try { @@ -62,8 +60,8 @@ public class CMSInvalidityDateExtension } public Extension getCRLExtension(IConfigStore config, - Object crlIssuingPoint, - boolean critical) { + Object crlIssuingPoint, + boolean critical) { InvalidityDateExtension invalidityDateExt = null; return invalidityDateExt; @@ -78,17 +76,17 @@ public class CMSInvalidityDateExtension public String[] getExtendedPluginInfo(Locale locale) { String[] params = { - //"type;choice(CRLExtension,CRLEntryExtension);"+ - //"CRL Entry Extension type. This field is not editable.", + // "type;choice(CRLExtension,CRLEntryExtension);"+ + // "CRL Entry Extension type. This field is not editable.", "enable;boolean;Check to enable Invalidity Date CRL entry extension.", "critical;boolean;Set criticality for Invalidity Date CRL entry extension.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-invaliditydate", + ";configuration-ca-edit-crlextension-invaliditydate", IExtendedPluginInfo.HELP_TEXT + - ";The invalidity date is a non-critical CRL entry extension " + - "that provides the date on which it is known or suspected " + - "that the private key was compromised or that the certificate" + - " otherwise became invalid." + ";The invalidity date is a non-critical CRL entry extension " + + "that provides the date on which it is known or suspected " + + "that the private key was compromised or that the certificate" + + " otherwise became invalid." }; return params; @@ -96,6 +94,6 @@ public class CMSInvalidityDateExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSInvalidityDateExtension - " + msg); + "CMSInvalidityDateExtension - " + msg); } -} +} diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java index 9ca9d5d2..428fb447 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Locale; @@ -47,14 +46,13 @@ import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; - /** * This represents a issuer alternative name extension. - * + * * @version $Revision$, $Date$ */ public class CMSIssuerAlternativeNameExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { private static final String PROP_RFC822_NAME = "rfc822Name"; private static final String PROP_DNS_NAME = "dNSName"; private static final String PROP_DIR_NAME = "directoryName"; @@ -70,7 +68,7 @@ public class CMSIssuerAlternativeNameExtension } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { IssuerAlternativeNameExtension issuerAltNameExt = null; GeneralNames names = null; @@ -84,8 +82,8 @@ public class CMSIssuerAlternativeNameExtension } public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + Object ip, + boolean critical) { ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; IssuerAlternativeNameExtension issuerAltNameExt = null; int numNames = 0; @@ -196,7 +194,7 @@ public class CMSIssuerAlternativeNameExtension numNames = config.getInteger("numNames", 0); } catch (EBaseException e) { log(ILogger.LL_FAILURE, "Invalid numNames property for CRL " + - "IssuerAlternativeName extension - " + e); + "IssuerAlternativeName extension - " + e); } nvp.add("numNames", String.valueOf(numNames)); @@ -207,10 +205,10 @@ public class CMSIssuerAlternativeNameExtension nameType = config.getString("nameType" + i); } catch (EPropertyNotFound e) { log(ILogger.LL_FAILURE, "Undefined nameType" + i + " property for " + - "CRL IssuerAlternativeName extension - " + e); + "CRL IssuerAlternativeName extension - " + e); } catch (EBaseException e) { log(ILogger.LL_FAILURE, "Invalid nameType" + i + " property for " + - "CRL IssuerAlternativeName extension - " + e); + "CRL IssuerAlternativeName extension - " + e); } if (nameType != null && nameType.length() > 0) { @@ -225,10 +223,10 @@ public class CMSIssuerAlternativeNameExtension name = config.getString("name" + i); } catch (EPropertyNotFound e) { log(ILogger.LL_FAILURE, "Undefined name" + i + " property for " + - "CRL IssuerAlternativeName extension - " + e); + "CRL IssuerAlternativeName extension - " + e); } catch (EBaseException e) { log(ILogger.LL_FAILURE, "Invalid name" + i + " property for " + - "CRL IssuerAlternativeName extension - " + e); + "CRL IssuerAlternativeName extension - " + e); } if (name != null && name.length() > 0) { @@ -248,28 +246,28 @@ public class CMSIssuerAlternativeNameExtension public String[] getExtendedPluginInfo(Locale locale) { String[] params = { - //"type;choice(CRLExtension,CRLEntryExtension);"+ - //"CRL Extension type. This field is not editable.", + // "type;choice(CRLExtension,CRLEntryExtension);"+ + // "CRL Extension type. This field is not editable.", "enable;boolean;Check to enable Issuer Alternative Name CRL extension.", "critical;boolean;Set criticality for Issuer Alternative Name CRL extension.", "numNames;number;Set number of alternative names for the CRL issuer.", "nameType0;choice(" + PROP_RFC822_NAME + "," + PROP_DIR_NAME + "," + PROP_DNS_NAME + "," + - PROP_EDI_NAME + "," + PROP_URI_NAME + "," + PROP_IP_NAME + "," + PROP_OID_NAME + "," + - PROP_OTHER_NAME + ");Select Issuer Alternative Name type.", + PROP_EDI_NAME + "," + PROP_URI_NAME + "," + PROP_IP_NAME + "," + PROP_OID_NAME + "," + + PROP_OTHER_NAME + ");Select Issuer Alternative Name type.", "name0;string;Enter Issuer Alternative Name corresponding to the selected name type.", "nameType1;choice(" + PROP_RFC822_NAME + "," + PROP_DIR_NAME + "," + PROP_DNS_NAME + "," + - PROP_EDI_NAME + "," + PROP_URI_NAME + "," + PROP_IP_NAME + "," + PROP_OID_NAME + "," + - PROP_OTHER_NAME + ");Select Issuer Alternative Name type.", + PROP_EDI_NAME + "," + PROP_URI_NAME + "," + PROP_IP_NAME + "," + PROP_OID_NAME + "," + + PROP_OTHER_NAME + ");Select Issuer Alternative Name type.", "name1;string;Enter Issuer Alternative Name corresponding to the selected name type.", "nameType2;choice(" + PROP_RFC822_NAME + "," + PROP_DIR_NAME + "," + PROP_DNS_NAME + "," + - PROP_EDI_NAME + "," + PROP_URI_NAME + "," + PROP_IP_NAME + "," + PROP_OID_NAME + "," + - PROP_OTHER_NAME + ");Select Issuer Alternative Name type.", + PROP_EDI_NAME + "," + PROP_URI_NAME + "," + PROP_IP_NAME + "," + PROP_OID_NAME + "," + + PROP_OTHER_NAME + ");Select Issuer Alternative Name type.", "name2;string;Enter Issuer Alternative Name corresponding to the selected name type.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-issueralternativename", + ";configuration-ca-edit-crlextension-issueralternativename", IExtendedPluginInfo.HELP_TEXT + - ";The issuer alternative names extension allows additional" + - " identities to be associated with the issuer of the CRL." + ";The issuer alternative names extension allows additional" + + " identities to be associated with the issuer of the CRL." }; return params; @@ -277,6 +275,6 @@ public class CMSIssuerAlternativeNameExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSIssuerAlternativeNameExtension - " + msg); + "CMSIssuerAlternativeNameExtension - " + msg); } -} +} diff --git a/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java b/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java index ccc5b64d..498e358c 100644 --- a/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java +++ b/pki/base/common/src/com/netscape/cms/crl/CMSIssuingDistributionPointExtension.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cms.crl; - import java.io.IOException; import java.util.Locale; import java.util.StringTokenizer; @@ -43,14 +42,13 @@ import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.logging.ILogger; - /** * This represents a issuing distribution point extension. - * + * * @version $Revision$, $Date$ */ public class CMSIssuingDistributionPointExtension - implements ICMSCRLExtension, IExtendedPluginInfo { + implements ICMSCRLExtension, IExtendedPluginInfo { public static final String PROP_POINTTYPE = "pointType"; public static final String PROP_POINTNAME = "pointName"; public static final String PROP_DIRNAME = "DirectoryName"; @@ -61,14 +59,14 @@ public class CMSIssuingDistributionPointExtension public static final String PROP_INDIRECT = "indirectCRL"; public static final String PROP_REASONS = "onlySomeReasons"; - private static final String[] reasonFlags = {"unused", + private static final String[] reasonFlags = { "unused", "keyCompromise", "cACompromise", "affiliationChanged", "superseded", "cessationOfOperation", "certificateHold", - "privilegeWithdrawn"}; + "privilegeWithdrawn" }; private ILogger mLogger = CMS.getLogger(); @@ -76,9 +74,9 @@ public class CMSIssuingDistributionPointExtension } public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + boolean critical) { IssuingDistributionPointExtension issuingDPointExt = - (IssuingDistributionPointExtension) ext; + (IssuingDistributionPointExtension) ext; issuingDPointExt.setCritical(critical); @@ -86,8 +84,8 @@ public class CMSIssuingDistributionPointExtension } public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + Object ip, + boolean critical) { CMS.debug("in CMSIssuingDistributionPointExtension::getCRLExtension."); ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; @@ -164,7 +162,7 @@ public class CMSIssuingDistributionPointExtension } if (reasons != null && reasons.length() > 0) { - boolean[] bits = {false, false, false, false, false, false, false}; + boolean[] bits = { false, false, false, false, false, false, false }; int k = 0; StringTokenizer st = new StringTokenizer(reasons, ","); @@ -275,25 +273,22 @@ public class CMSIssuingDistributionPointExtension log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", "caCertsOnly", e.toString())); } // Disable these for now unitl we support them fully -/* - try { - boolean userCertsOnly = config.getBoolean(PROP_USERCERTS, false); - - nvp.add(PROP_USERCERTS, String.valueOf(userCertsOnly)); - } catch (EBaseException e) { - nvp.add(PROP_USERCERTS, "false"); - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", "userCertsOnly", e.toString())); - } - - try { - boolean indirectCRL = config.getBoolean(PROP_INDIRECT, false); - - nvp.add(PROP_INDIRECT, String.valueOf(indirectCRL)); - } catch (EBaseException e) { - nvp.add(PROP_INDIRECT, "false"); - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", "indirectCRL", e.toString())); - } -*/ + /* + * try { boolean userCertsOnly = config.getBoolean(PROP_USERCERTS, + * false); + * + * nvp.add(PROP_USERCERTS, String.valueOf(userCertsOnly)); } catch + * (EBaseException e) { nvp.add(PROP_USERCERTS, "false"); + * log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", + * "userCertsOnly", e.toString())); } + * + * try { boolean indirectCRL = config.getBoolean(PROP_INDIRECT, false); + * + * nvp.add(PROP_INDIRECT, String.valueOf(indirectCRL)); } catch + * (EBaseException e) { nvp.add(PROP_INDIRECT, "false"); + * log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", + * "indirectCRL", e.toString())); } + */ } public String[] getExtendedPluginInfo(Locale locale) { @@ -305,25 +300,26 @@ public class CMSIssuingDistributionPointExtension sb_reasons.append(reasonFlags[i]); } String[] params = { - //"type;choice(CRLExtension,CRLEntryExtension);"+ - //"CRL Extension type. This field is not editable.", + // "type;choice(CRLExtension,CRLEntryExtension);"+ + // "CRL Extension type. This field is not editable.", "enable;boolean;Check to enable Issuing Distribution Point CRL extension.", "critical;boolean;Set criticality for Issuing Distribution Point CRL extension.", PROP_POINTTYPE + ";choice(" + PROP_DIRNAME + "," + PROP_URINAME + "," + - PROP_RDNNAME + ");Select Issuing Distribution Point name type.", + PROP_RDNNAME + ");Select Issuing Distribution Point name type.", PROP_POINTNAME + ";string;Enter Issuing Distribution Point name " + - "corresponding to the selected point type.", + "corresponding to the selected point type.", PROP_REASONS + ";string;Select any combination of the following reasons: " + - sb_reasons.toString(), + sb_reasons.toString(), PROP_CACERTS + ";boolean;Check if CRL contains CA certificates only", - // Remove these from the UI until they can be supported fully. - // PROP_USERCERTS + ";boolean;Check if CRL contains user certificates only", - // PROP_INDIRECT + ";boolean;Check if CRL is built indirectly.", + // Remove these from the UI until they can be supported fully. + // PROP_USERCERTS + + // ";boolean;Check if CRL contains user certificates only", + // PROP_INDIRECT + ";boolean;Check if CRL is built indirectly.", IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-issuingdistributionpoint", + ";configuration-ca-edit-crlextension-issuingdistributionpoint", IExtendedPluginInfo.HELP_TEXT + - ";The issuing distribution point is a critical CRL extension " + - "that identifies the CRL distribution point for a particular CRL." + ";The issuing distribution point is a critical CRL extension " + + "that identifies the CRL distribution point for a particular CRL." }; return params; @@ -331,6 +327,6 @@ public class CMSIssuingDistributionPointExtension private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSIssuingDistributionPointExtension - " + msg); + "CMSIssuingDistributionPointExtension - " + msg); } -} +} |