diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/crl')
11 files changed, 598 insertions, 470 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 6fe802e72..5ca09320c 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 { +public class CMSAuthInfoAccessExtension 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"; @@ -61,8 +59,7 @@ public class CMSAuthInfoAccessExtension public CMSAuthInfoAccessExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { AuthInfoAccessExtension authInfoAccessExt = (AuthInfoAccessExtension) ext; authInfoAccessExt.setCritical(critical); @@ -71,16 +68,19 @@ public class CMSAuthInfoAccessExtension } public Extension getCRLExtension(IConfigStore config, Object ip, - boolean critical) { + boolean critical) { ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; - AuthInfoAccessExtension authInfoAccessExt = new AuthInfoAccessExtension(critical); + AuthInfoAccessExtension authInfoAccessExt = new AuthInfoAccessExtension( + critical); int numberOfAccessDescriptions = 0; try { numberOfAccessDescriptions = config.getInteger(PROP_NUM_ADS, 0); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_INVALID_NUM_ADS", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AIA_INVALID_NUM_ADS", + e.toString())); } if (numberOfAccessDescriptions > 0) { @@ -94,54 +94,72 @@ public class CMSAuthInfoAccessExtension try { accessMethod = config.getString(PROP_ACCESS_METHOD + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_AD_AM_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_AIA_AD_AM_UNDEFINED", e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_AD_AM_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AIA_AD_AM_INVALID", + e.toString())); } - if (accessMethod != null && accessMethod.equals(PROP_ACCESS_METHOD_OCSP)) { + if (accessMethod != null + && accessMethod.equals(PROP_ACCESS_METHOD_OCSP)) { method = AuthInfoAccessExtension.METHOD_OCSP; } try { - accessLocationType = config.getString(PROP_ACCESS_LOCATION_TYPE + i); + accessLocationType = config + .getString(PROP_ACCESS_LOCATION_TYPE + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_AD_ALT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_AIA_AD_ALT_UNDEFINED", e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_AD_ALT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_AIA_AD_ALT_INVALID", e.toString())); } try { accessLocation = config.getString(PROP_ACCESS_LOCATION + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_DIST_POINT_INVALID", e.toString())); } - if (accessLocationType != null && accessLocation != null && accessLocation.length() > 0) { + if (accessLocationType != null && accessLocation != null + && accessLocation.length() > 0) { if (accessLocationType.equalsIgnoreCase(PROP_DIRNAME)) { try { X500Name dirName = new X500Name(accessLocation); - authInfoAccessExt.addAccessDescription(method, new GeneralName(dirName)); + authInfoAccessExt.addAccessDescription(method, + new GeneralName(dirName)); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_500NAME", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_INVALID_500NAME", e.toString())); } - } else if (accessLocationType.equalsIgnoreCase(PROP_URINAME)) { + } else if (accessLocationType + .equalsIgnoreCase(PROP_URINAME)) { URIName uriName = new URIName(accessLocation); - authInfoAccessExt.addAccessDescription(method, new GeneralName(uriName)); + authInfoAccessExt.addAccessDescription(method, + new GeneralName(uriName)); } else { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_POTINT_TYPE", accessLocation)); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_INVALID_POTINT_TYPE", accessLocation)); } } else { accessLocationType = PROP_URINAME; 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)); + authInfoAccessExt.addAccessDescription( + AuthInfoAccessExtension.METHOD_CA_ISSUERS, + new GeneralName(uriName)); } } } @@ -160,7 +178,9 @@ public class CMSAuthInfoAccessExtension try { numberOfAccessDescriptions = config.getInteger(PROP_NUM_ADS, 0); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_INVALID_NUM_ADS", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AIA_INVALID_NUM_ADS", + e.toString())); } nvp.add(PROP_NUM_ADS, String.valueOf(numberOfAccessDescriptions)); @@ -172,9 +192,13 @@ public class CMSAuthInfoAccessExtension try { accessMethod = config.getString(PROP_ACCESS_METHOD + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_AD_AM_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AIA_AD_AM_UNDEFINED", + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_AD_AM_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AIA_AD_AM_INVALID", + e.toString())); } if (accessMethod != null && accessMethod.length() > 0) { @@ -184,11 +208,16 @@ public class CMSAuthInfoAccessExtension } try { - accessLocationType = config.getString(PROP_ACCESS_LOCATION_TYPE + i); + accessLocationType = config.getString(PROP_ACCESS_LOCATION_TYPE + + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_AD_ALT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AIA_AD_ALT_UNDEFINED", + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_AD_ALT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AIA_AD_ALT_INVALID", + e.toString())); } if (accessLocationType != null && accessLocationType.length() > 0) { @@ -200,9 +229,13 @@ public class CMSAuthInfoAccessExtension try { accessLocation = config.getString(PROP_ACCESS_LOCATION + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_AD_AL_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AIA_AD_AL_UNDEFINED", + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AIA_AD_AL_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AIA_AD_AL_INVALID", + e.toString())); } if (accessLocation != null && accessLocation.length() > 0) { @@ -211,7 +244,8 @@ 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); } @@ -223,40 +257,42 @@ public class CMSAuthInfoAccessExtension "enable;boolean;Check to enable Authority Information Access extension.", "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_LOCATION_TYPE + "0;choice(" + PROP_URINAME + "," + - PROP_DIRNAME + ");Select access location type.", - PROP_ACCESS_LOCATION + "0;string;Enter access location " + - "corresponding to the selected access location type.", - IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-authorityinformationaccess", - PROP_ACCESS_METHOD + "1;choice(" + PROP_ACCESS_METHOD_CAISSUERS + "," + - PROP_ACCESS_METHOD_OCSP +");Select access description method.", - PROP_ACCESS_LOCATION_TYPE + "1;choice(" + PROP_URINAME + "," + - PROP_DIRNAME + ");Select access location type.", - PROP_ACCESS_LOCATION + "1;string;Enter access location " + - "corresponding to the selected access location type.", - IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-authorityinformationaccess", - PROP_ACCESS_METHOD + "2;choice(" + PROP_ACCESS_METHOD_CAISSUERS + "," + - PROP_ACCESS_METHOD_OCSP +");Select access description method.", - PROP_ACCESS_LOCATION_TYPE + "2;choice(" + PROP_URINAME + "," + - PROP_DIRNAME + ");Select access location type.", - PROP_ACCESS_LOCATION + "2;string;Enter access location " + - "corresponding to the selected access location type.", - IExtendedPluginInfo.HELP_TOKEN + - ";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." - }; + PROP_ACCESS_METHOD + "0;choice(" + PROP_ACCESS_METHOD_CAISSUERS + + "," + PROP_ACCESS_METHOD_OCSP + + ");Select access description method.", + PROP_ACCESS_LOCATION_TYPE + "0;choice(" + PROP_URINAME + "," + + PROP_DIRNAME + ");Select access location type.", + PROP_ACCESS_LOCATION + "0;string;Enter access location " + + "corresponding to the selected access location type.", + IExtendedPluginInfo.HELP_TOKEN + + ";configuration-ca-edit-crlextension-authorityinformationaccess", + PROP_ACCESS_METHOD + "1;choice(" + PROP_ACCESS_METHOD_CAISSUERS + + "," + PROP_ACCESS_METHOD_OCSP + + ");Select access description method.", + PROP_ACCESS_LOCATION_TYPE + "1;choice(" + PROP_URINAME + "," + + PROP_DIRNAME + ");Select access location type.", + PROP_ACCESS_LOCATION + "1;string;Enter access location " + + "corresponding to the selected access location type.", + IExtendedPluginInfo.HELP_TOKEN + + ";configuration-ca-edit-crlextension-authorityinformationaccess", + PROP_ACCESS_METHOD + "2;choice(" + PROP_ACCESS_METHOD_CAISSUERS + + "," + PROP_ACCESS_METHOD_OCSP + + ");Select access description method.", + PROP_ACCESS_LOCATION_TYPE + "2;choice(" + PROP_URINAME + "," + + PROP_DIRNAME + ");Select access location type.", + PROP_ACCESS_LOCATION + "2;string;Enter access location " + + "corresponding to the selected access location type.", + IExtendedPluginInfo.HELP_TOKEN + + ";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." }; return params; } 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 4cdb0bdc0..494de7992 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,43 +42,42 @@ 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 { +public class CMSAuthorityKeyIdentifierExtension implements ICMSCRLExtension, + IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSAuthorityKeyIdentifierExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { AuthorityKeyIdentifierExtension authKeyIdExt = null; KeyIdentifier keyId = null; GeneralNames names = null; SerialNumber sn = null; try { - keyId = (KeyIdentifier) ((AuthorityKeyIdentifierExtension) ext).get( - AuthorityKeyIdentifierExtension.KEY_ID); - names = (GeneralNames) ((AuthorityKeyIdentifierExtension) ext).get( - AuthorityKeyIdentifierExtension.AUTH_NAME); - sn = (SerialNumber) ((AuthorityKeyIdentifierExtension) ext).get( - AuthorityKeyIdentifierExtension.SERIAL_NUMBER); - authKeyIdExt = new AuthorityKeyIdentifierExtension(critical, keyId, names, sn); + keyId = (KeyIdentifier) ((AuthorityKeyIdentifierExtension) ext) + .get(AuthorityKeyIdentifierExtension.KEY_ID); + names = (GeneralNames) ((AuthorityKeyIdentifierExtension) ext) + .get(AuthorityKeyIdentifierExtension.AUTH_NAME); + sn = (SerialNumber) ((AuthorityKeyIdentifierExtension) ext) + .get(AuthorityKeyIdentifierExtension.SERIAL_NUMBER); + authKeyIdExt = new AuthorityKeyIdentifierExtension(critical, keyId, + names, sn); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AKI_EXT", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AKI_EXT", e.toString())); } return authKeyIdExt; } - public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + public Extension getCRLExtension(IConfigStore config, Object ip, + boolean critical) { AuthorityKeyIdentifierExtension authKeyIdExt = null; ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; @@ -87,48 +85,58 @@ public class CMSAuthorityKeyIdentifierExtension KeyIdentifier keyId = null; try { - X509CertInfo info = (X509CertInfo) - ((ICertificateAuthority) crlIssuingPoint.getCertificateAuthority()).getCACert().get( + X509CertInfo info = (X509CertInfo) ((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++) { - Extension caCertExt = (Extension) caCertExtensions.elementAt(i); + Extension caCertExt = (Extension) caCertExtensions + .elementAt(i); if (caCertExt instanceof SubjectKeyIdentifierExtension) { - SubjectKeyIdentifierExtension id = - (SubjectKeyIdentifierExtension) caCertExt; + SubjectKeyIdentifierExtension id = (SubjectKeyIdentifierExtension) caCertExt; - keyId = (KeyIdentifier) - id.get(SubjectKeyIdentifierExtension.KEY_ID); + keyId = (KeyIdentifier) id + .get(SubjectKeyIdentifierExtension.KEY_ID); } } } } } catch (CertificateParsingException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CERT_PARSING_ERROR", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CERT_PARSING_ERROR", + e.toString())); } catch (CertificateException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CERT_CERT_EXCEPTION", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CERT_CERT_EXCEPTION", + e.toString())); } if (keyId != null) { - authKeyIdExt = new AuthorityKeyIdentifierExtension(critical, keyId, null, null); + authKeyIdExt = new AuthorityKeyIdentifierExtension(critical, + keyId, null, null); } else { GeneralNames gNames = new GeneralNames(); - gNames.addElement(((ICertificateAuthority) crlIssuingPoint.getCertificateAuthority()).getX500Name()); + gNames.addElement(((ICertificateAuthority) crlIssuingPoint + .getCertificateAuthority()).getX500Name()); - authKeyIdExt = new AuthorityKeyIdentifierExtension(critical, null, gNames, - new SerialNumber(((ICertificateAuthority) crlIssuingPoint.getCertificateAuthority()).getCACert().getSerialNumber())); + authKeyIdExt = new AuthorityKeyIdentifierExtension(critical, + null, gNames, new SerialNumber( + ((ICertificateAuthority) crlIssuingPoint + .getCertificateAuthority()).getCACert() + .getSerialNumber())); } } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_AKI_EXT", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_AKI_EXT", e.toString())); } return authKeyIdExt; @@ -143,23 +151,22 @@ 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", - 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." - }; + IExtendedPluginInfo.HELP_TOKEN + + ";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." }; return params; } 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 e4bb4cb68..c7c7af710 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,46 +33,45 @@ 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 { +public class CMSCRLNumberExtension implements ICMSCRLExtension, + IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSCRLNumberExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { BigInteger crlNumber = null; CRLNumberExtension crlNumberExt = null; try { - crlNumber = (BigInteger) - ((CRLNumberExtension) ext).get(CRLNumberExtension.NUMBER); + crlNumber = (BigInteger) ((CRLNumberExtension) ext) + .get(CRLNumberExtension.NUMBER); crlNumberExt = new CRLNumberExtension(Boolean.valueOf(critical), - crlNumber); + crlNumber); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_CRL_NUMBER_EXT", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_CRL_NUMBER_EXT", e.toString())); } return crlNumberExt; } - public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + public Extension getCRLExtension(IConfigStore config, Object ip, + boolean critical) { CRLNumberExtension crlNumberExt = null; ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; try { crlNumberExt = new CRLNumberExtension(Boolean.valueOf(critical), - crlIssuingPoint.getNextCRLNumber()); + crlIssuingPoint.getNextCRLNumber()); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_CRL_NUMBER_EXT", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_CRL_NUMBER_EXT", e.toString())); } return crlNumberExt; } @@ -87,23 +85,22 @@ 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", - 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" - }; + IExtendedPluginInfo.HELP_TOKEN + + ";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" }; return params; } 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 245428a6d..0471af42d 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,36 +32,36 @@ 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 { +public class CMSCRLReasonExtension implements ICMSCRLExtension, + IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSCRLReasonExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { RevocationReason reason = null; CRLReasonExtension crlReasonExt = null; try { - reason = (RevocationReason) ((CRLReasonExtension) ext).get(CRLReasonExtension.REASON); - crlReasonExt = new CRLReasonExtension(Boolean.valueOf(critical), reason); + reason = (RevocationReason) ((CRLReasonExtension) ext) + .get(CRLReasonExtension.REASON); + crlReasonExt = new CRLReasonExtension(Boolean.valueOf(critical), + reason); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_CRL_REASON_EXT", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_CRL_REASON_EXT", e.toString())); } return crlReasonExt; } public Extension getCRLExtension(IConfigStore config, - Object crlIssuingPoint, - boolean critical) { + Object crlIssuingPoint, boolean critical) { CRLReasonExtension crlReasonExt = null; return crlReasonExt; @@ -77,22 +76,21 @@ 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", - IExtendedPluginInfo.HELP_TEXT + - ";The CRL reason code is a non-critical CRL entry extension " + - "that identifies the reason for the certificate revocation." - }; + IExtendedPluginInfo.HELP_TOKEN + + ";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." }; return params; } 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 601e15d2f..0e9121394 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,35 +39,35 @@ import com.netscape.certsrv.logging.ILogger; /** * This represents a certificate issuer extension. - * + * * @version $Revision$, $Date$ */ -public class CMSCertificateIssuerExtension - implements ICMSCRLExtension, IExtendedPluginInfo { +public class CMSCertificateIssuerExtension implements ICMSCRLExtension, + IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSCertificateIssuerExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { CertificateIssuerExtension certIssuerExt = null; GeneralNames names = null; try { - names = (GeneralNames) ((CertificateIssuerExtension) ext).get( - CertificateIssuerExtension.CERTIFICATE_ISSUER); - certIssuerExt = new CertificateIssuerExtension(Boolean.valueOf(critical), - names); + names = (GeneralNames) ((CertificateIssuerExtension) ext) + .get(CertificateIssuerExtension.CERTIFICATE_ISSUER); + certIssuerExt = new CertificateIssuerExtension( + Boolean.valueOf(critical), names); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_CERT_ISSUER_EXT", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_CERT_ISSUER_EXT", + e.toString())); } return certIssuerExt; } - public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + public Extension getCRLExtension(IConfigStore config, Object ip, + boolean critical) { CertificateIssuerExtension certIssuerExt = null; int numNames = 0; @@ -77,7 +76,9 @@ public class CMSCertificateIssuerExtension try { numNames = config.getInteger("numNames", 0); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_NUM_NAMES", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_INVALID_NUM_NAMES", + e.toString())); } if (numNames > 0) { GeneralNames names = new GeneralNames(); @@ -88,9 +89,13 @@ public class CMSCertificateIssuerExtension try { nameType = config.getString("nameType" + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_UNDEFINED_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_UNDEFINED_TYPE", Integer.toString(i), + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_INVALID_TYPE", Integer.toString(i), + e.toString())); } if (nameType != null) { @@ -99,9 +104,13 @@ public class CMSCertificateIssuerExtension try { name = config.getString("name" + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_UNDEFINED_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_UNDEFINED_TYPE", + Integer.toString(i), e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_INVALID_TYPE", Integer.toString(i), + e.toString())); } if (name != null && name.length() > 0) { @@ -111,14 +120,17 @@ public class CMSCertificateIssuerExtension names.addElement(dirName); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_500NAME", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_INVALID_500NAME", + e.toString())); } } else if (nameType.equalsIgnoreCase("URI")) { URIName uriName = new URIName(name); names.addElement(uriName); } else { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_NAME_TYPE", nameType)); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_INVALID_NAME_TYPE", nameType)); } } } @@ -127,9 +139,11 @@ public class CMSCertificateIssuerExtension if (names.size() > 0) { try { certIssuerExt = new CertificateIssuerExtension( - Boolean.valueOf(critical), names); + Boolean.valueOf(critical), names); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_CERT_ISSUER_EXT", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_CERT_ISSUER_EXT", + e.toString())); } } } @@ -147,7 +161,9 @@ public class CMSCertificateIssuerExtension try { numNames = config.getInteger("numNames", 0); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_NUM_NAMES", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_INVALID_NUM_NAMES", + e.toString())); } nvp.add("numNames", String.valueOf(numNames)); @@ -157,9 +173,13 @@ public class CMSCertificateIssuerExtension try { nameType = config.getString("nameType" + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_UNDEFINED_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_UNDEFINED_TYPE", + Integer.toString(i), e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_INVALID_TYPE", + Integer.toString(i), e.toString())); } if (nameType != null && nameType.length() > 0) { @@ -173,9 +193,13 @@ public class CMSCertificateIssuerExtension try { name = config.getString("name" + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_UNDEFINED_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_UNDEFINED_TYPE", + Integer.toString(i), e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_INVALID_TYPE", + Integer.toString(i), e.toString())); } if (name != null && name.length() > 0) { @@ -195,8 +219,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.", @@ -206,12 +230,11 @@ public class CMSCertificateIssuerExtension "name1;string;Enter Certificate Issuer name corresponding to the selected name type.", "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", - IExtendedPluginInfo.HELP_TEXT + - ";This CRL entry extension identifies the certificate issuer" + - " associated with an entry in an indirect CRL." - }; + IExtendedPluginInfo.HELP_TOKEN + + ";configuration-ca-edit-crlextension-certificateissuer", + IExtendedPluginInfo.HELP_TEXT + + ";This CRL entry extension identifies the certificate issuer" + + " associated with an entry in an indirect CRL." }; return params; } @@ -219,4 +242,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 35d21e5c7..7808e58e3 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,48 +33,45 @@ 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 { +public class CMSDeltaCRLIndicatorExtension implements ICMSCRLExtension, + IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSDeltaCRLIndicatorExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { BigInteger baseCRLNumber = null; DeltaCRLIndicatorExtension deltaCRLIndicatorExt = null; try { - baseCRLNumber = (BigInteger) - ((DeltaCRLIndicatorExtension) ext).get(DeltaCRLIndicatorExtension.NUMBER); + baseCRLNumber = (BigInteger) ((DeltaCRLIndicatorExtension) ext) + .get(DeltaCRLIndicatorExtension.NUMBER); deltaCRLIndicatorExt = new DeltaCRLIndicatorExtension( - Boolean.valueOf(critical), - baseCRLNumber); + Boolean.valueOf(critical), baseCRLNumber); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DELTA_CRL_EXT", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DELTA_CRL_EXT", e.toString())); } return deltaCRLIndicatorExt; } - public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + public Extension getCRLExtension(IConfigStore config, Object ip, + boolean critical) { DeltaCRLIndicatorExtension deltaCRLIndicatorExt = null; ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; try { deltaCRLIndicatorExt = new DeltaCRLIndicatorExtension( - Boolean.valueOf(critical), - crlIssuingPoint.getCRLNumber()); + Boolean.valueOf(critical), crlIssuingPoint.getCRLNumber()); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DELTA_CRL_EXT", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DELTA_CRL_EXT", e.toString())); } return deltaCRLIndicatorExt; } @@ -89,23 +85,21 @@ 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", - IExtendedPluginInfo.HELP_TEXT + - ";The Delta CRL Indicator is a critical CRL extension " + - "which identifies a delta-CRL." - }; + IExtendedPluginInfo.HELP_TOKEN + + ";configuration-ca-edit-crlextension-crlnumber", + IExtendedPluginInfo.HELP_TEXT + + ";The Delta CRL Indicator is a critical CRL extension " + + "which identifies a delta-CRL." }; return params; } 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 86bdd05e2..edc9a2c85 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 { +public class CMSFreshestCRLExtension 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"; @@ -59,8 +57,7 @@ public class CMSFreshestCRLExtension public CMSFreshestCRLExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { FreshestCRLExtension freshestCRLExt = (FreshestCRLExtension) ext; freshestCRLExt.setCritical(critical); @@ -69,7 +66,7 @@ public class CMSFreshestCRLExtension } public Extension getCRLExtension(IConfigStore config, Object ip, - boolean critical) { + boolean critical) { ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; FreshestCRLExtension freshestCRLExt = null; @@ -78,7 +75,9 @@ public class CMSFreshestCRLExtension try { numPoints = config.getInteger("numPoints", 0); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_ISSUER_INVALID_NUM_NAMES", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_ISSUER_INVALID_NUM_NAMES", + e.toString())); } if (numPoints > 0) { @@ -91,9 +90,11 @@ public class CMSFreshestCRLExtension try { pointType = config.getString(PROP_POINTTYPE + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_DIST_POINT_INVALID", e.toString())); } if (pointType != null) { @@ -102,9 +103,13 @@ public class CMSFreshestCRLExtension try { pointName = config.getString(PROP_POINTNAME + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage( + "CRL_CREATE_DIST_POINT_UNDEFINED", + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_DIST_POINT_INVALID", e.toString())); } if (pointName != null && pointName.length() > 0) { @@ -114,14 +119,17 @@ public class CMSFreshestCRLExtension names.addElement(dirName); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_500NAME", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_INVALID_500NAME", + e.toString())); } } else if (pointType.equalsIgnoreCase(PROP_URINAME)) { URIName uriName = new URIName(pointName); names.addElement(uriName); } else { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_POTINT_TYPE", pointType)); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_INVALID_POTINT_TYPE", pointType)); } } } @@ -130,9 +138,13 @@ public class CMSFreshestCRLExtension try { crlDP.setFullName(names); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CANNOT_SET_NAME", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CANNOT_SET_NAME", + e.toString())); } catch (GeneralNamesException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CANNOT_SET_NAME", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CANNOT_SET_NAME", + e.toString())); } } @@ -158,8 +170,8 @@ public class CMSFreshestCRLExtension try { numPoints = config.getInteger(PROP_NUM_POINTS, 0); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, "Invalid numPoints property for CRL " + - "Freshest CRL extension - " + e); + log(ILogger.LL_FAILURE, "Invalid numPoints property for CRL " + + "Freshest CRL extension - " + e); } nvp.add(PROP_NUM_POINTS, String.valueOf(numPoints)); @@ -169,9 +181,13 @@ public class CMSFreshestCRLExtension try { pointType = config.getString(PROP_POINTTYPE + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", + e.toString())); } if (pointType != null && pointType.length() > 0) { @@ -185,9 +201,13 @@ public class CMSFreshestCRLExtension try { pointName = config.getString(PROP_POINTNAME + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", + e.toString())); } if (pointName != null && pointName.length() > 0) { @@ -202,35 +222,38 @@ public class CMSFreshestCRLExtension String[] params = { "enable;boolean;Check to enable Freshest CRL extension.", "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.", - PROP_POINTNAME + "0;string;Enter CRL distribution point name " + - "corresponding to the selected point type.", - IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-issuingdistributionpoint", - PROP_POINTTYPE + "1;choice(" + PROP_DIRNAME + "," + PROP_URINAME + - ");Select CRL distribution point name type.", - PROP_POINTNAME + "1;string;Enter CRL distribution point name " + - "corresponding to the selected point type.", - IExtendedPluginInfo.HELP_TOKEN + - ";configuration-ca-edit-crlextension-issuingdistributionpoint", - PROP_POINTTYPE + "2;choice(" + PROP_DIRNAME + "," + PROP_URINAME + - ");Select CRL distribution point name type.", - PROP_POINTNAME + "2;string;Enter CRL distribution point name " + - "corresponding to the selected point type.", - IExtendedPluginInfo.HELP_TOKEN + - ";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." - }; + PROP_NUM_POINTS + + ";number;Set number of CRL distribution points.", + PROP_POINTTYPE + "0;choice(" + PROP_DIRNAME + "," + + PROP_URINAME + + ");Select CRL distribution point name type.", + PROP_POINTNAME + "0;string;Enter CRL distribution point name " + + "corresponding to the selected point type.", + IExtendedPluginInfo.HELP_TOKEN + + ";configuration-ca-edit-crlextension-issuingdistributionpoint", + PROP_POINTTYPE + "1;choice(" + PROP_DIRNAME + "," + + PROP_URINAME + + ");Select CRL distribution point name type.", + PROP_POINTNAME + "1;string;Enter CRL distribution point name " + + "corresponding to the selected point type.", + IExtendedPluginInfo.HELP_TOKEN + + ";configuration-ca-edit-crlextension-issuingdistributionpoint", + PROP_POINTTYPE + "2;choice(" + PROP_DIRNAME + "," + + PROP_URINAME + + ");Select CRL distribution point name type.", + PROP_POINTNAME + "2;string;Enter CRL distribution point name " + + "corresponding to the selected point type.", + IExtendedPluginInfo.HELP_TOKEN + + ";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." }; return params; } 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 e0e39b8a6..4d76625d1 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 { +public class CMSHoldInstructionExtension 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"; @@ -54,25 +52,24 @@ public class CMSHoldInstructionExtension public CMSHoldInstructionExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { HoldInstructionExtension holdInstrExt = null; try { - ObjectIdentifier holdInstr = - ((HoldInstructionExtension) ext).getHoldInstructionCode(); + ObjectIdentifier holdInstr = ((HoldInstructionExtension) ext) + .getHoldInstructionCode(); - holdInstrExt = new HoldInstructionExtension(Boolean.valueOf(critical), - holdInstr); + holdInstrExt = new HoldInstructionExtension( + Boolean.valueOf(critical), holdInstr); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_HOLD_INSTR_EXT", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_HOLD_INSTR_EXT", e.toString())); } return holdInstrExt; } - public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + public Extension getCRLExtension(IConfigStore config, Object ip, + boolean critical) { HoldInstructionExtension holdInstrExt = null; String instruction = null; @@ -81,9 +78,11 @@ public class CMSHoldInstructionExtension try { instruction = config.getString(PROP_INSTR); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_HOLD_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_HOLD_UNDEFINED", e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_HOLD_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_HOLD_INVALID", e.toString())); } ObjectIdentifier holdInstr = HoldInstructionExtension.NONE_HOLD_INSTR_OID; @@ -96,10 +95,11 @@ public class CMSHoldInstructionExtension } } try { - holdInstrExt = new HoldInstructionExtension(Boolean.valueOf(critical), - holdInstr); + holdInstrExt = new HoldInstructionExtension( + Boolean.valueOf(critical), holdInstr); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_HOLD_INSTR_EXT", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_HOLD_INSTR_EXT", e.toString())); } return holdInstrExt; @@ -115,14 +115,16 @@ public class CMSHoldInstructionExtension try { instruction = config.getString(PROP_INSTR); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_HOLD_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_HOLD_UNDEFINED", e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_HOLD_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_HOLD_INVALID", e.toString())); } if (instruction != null) { - if (!(instruction.equalsIgnoreCase(PROP_INSTR_NONE) || - instruction.equalsIgnoreCase(PROP_INSTR_CALLISSUER) || - instruction.equalsIgnoreCase(PROP_INSTR_REJECT))) { + if (!(instruction.equalsIgnoreCase(PROP_INSTR_NONE) + || instruction.equalsIgnoreCase(PROP_INSTR_CALLISSUER) || instruction + .equalsIgnoreCase(PROP_INSTR_REJECT))) { instruction = PROP_INSTR_NONE; } } else { @@ -133,26 +135,26 @@ 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.", - IExtendedPluginInfo.HELP_TOKEN + - ";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." - }; + PROP_INSTR + ";choice(" + PROP_INSTR_NONE + "," + + PROP_INSTR_CALLISSUER + "," + PROP_INSTR_REJECT + + ");Select hold instruction code.", + IExtendedPluginInfo.HELP_TOKEN + + ";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." }; return params; } 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 c0c622447..f296cf318 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,37 +32,37 @@ 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 { +public class CMSInvalidityDateExtension implements ICMSCRLExtension, + IExtendedPluginInfo { private ILogger mLogger = CMS.getLogger(); public CMSInvalidityDateExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { InvalidityDateExtension invalidityDateExt = null; try { - Date invalidityDate = ((InvalidityDateExtension) ext).getInvalidityDate(); + Date invalidityDate = ((InvalidityDateExtension) ext) + .getInvalidityDate(); - invalidityDateExt = new InvalidityDateExtension(Boolean.valueOf(critical), - invalidityDate); + invalidityDateExt = new InvalidityDateExtension( + Boolean.valueOf(critical), invalidityDate); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALIDITY_DATE_EXT", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_INVALIDITY_DATE_EXT", + e.toString())); } return invalidityDateExt; } public Extension getCRLExtension(IConfigStore config, - Object crlIssuingPoint, - boolean critical) { + Object crlIssuingPoint, boolean critical) { InvalidityDateExtension invalidityDateExt = null; return invalidityDateExt; @@ -78,24 +77,23 @@ 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", - 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." - }; + IExtendedPluginInfo.HELP_TOKEN + + ";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." }; return params; } 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 9ca9d5d2a..43a9f41d6 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 { +public class CMSIssuerAlternativeNameExtension 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"; @@ -69,23 +67,25 @@ public class CMSIssuerAlternativeNameExtension public CMSIssuerAlternativeNameExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { IssuerAlternativeNameExtension issuerAltNameExt = null; GeneralNames names = null; try { - names = (GeneralNames) ((IssuerAlternativeNameExtension) ext).get(IssuerAlternativeNameExtension.ISSUER_NAME); - issuerAltNameExt = new IssuerAlternativeNameExtension(Boolean.valueOf(critical), names); + names = (GeneralNames) ((IssuerAlternativeNameExtension) ext) + .get(IssuerAlternativeNameExtension.ISSUER_NAME); + issuerAltNameExt = new IssuerAlternativeNameExtension( + Boolean.valueOf(critical), names); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_ISSUER_ALT_NAME_EXT", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_ISSUER_ALT_NAME_EXT", + e.toString())); } return issuerAltNameExt; } - public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + public Extension getCRLExtension(IConfigStore config, Object ip, + boolean critical) { ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; IssuerAlternativeNameExtension issuerAltNameExt = null; int numNames = 0; @@ -93,7 +93,9 @@ public class CMSIssuerAlternativeNameExtension try { numNames = config.getInteger("numNames", 0); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_ISSUER_INVALID_NUM_NAMES", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_ISSUER_INVALID_NUM_NAMES", + e.toString())); } if (numNames > 0) { GeneralNames names = new GeneralNames(); @@ -104,9 +106,13 @@ public class CMSIssuerAlternativeNameExtension try { nameType = config.getString("nameType" + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_ISSUER_UNDEFINED_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_ISSUER_UNDEFINED_TYPE", + Integer.toString(i), e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_ISSUER_INVALID_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_ISSUER_INVALID_TYPE", + Integer.toString(i), e.toString())); } if (nameType != null && nameType.length() > 0) { @@ -115,9 +121,13 @@ public class CMSIssuerAlternativeNameExtension try { name = config.getString("name" + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_ISSUER_UNDEFINED_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_ISSUER_UNDEFINED_TYPE", + Integer.toString(i), e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_ISSUER_INVALID_TYPE", Integer.toString(i), e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_ISSUER_INVALID_TYPE", + Integer.toString(i), e.toString())); } if (name != null && name.length() > 0) { @@ -127,7 +137,9 @@ public class CMSIssuerAlternativeNameExtension names.addElement(dirName); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_500NAME", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_INVALID_500NAME", + e.toString())); } } else if (nameType.equalsIgnoreCase(PROP_RFC822_NAME)) { RFC822Name rfc822Name = new RFC822Name(name); @@ -157,16 +169,22 @@ public class CMSIssuerAlternativeNameExtension } else if (nameType.equalsIgnoreCase(PROP_OTHER_NAME)) { try { - byte[] val = com.netscape.osutil.OSUtil.AtoB(name); - DerValue derVal = new DerValue(new ByteArrayInputStream(val)); - GeneralName generalName = new GeneralName(derVal); + byte[] val = com.netscape.osutil.OSUtil + .AtoB(name); + DerValue derVal = new DerValue( + new ByteArrayInputStream(val)); + GeneralName generalName = new GeneralName( + derVal); names.addElement(generalName); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_OTHER_NAME", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_INVALID_OTHER_NAME", e.toString())); } } else { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_ISSUER_INVALID_TYPE", nameType, "")); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_ISSUER_INVALID_TYPE", nameType, + "")); } } } @@ -175,9 +193,10 @@ public class CMSIssuerAlternativeNameExtension if (names.size() > 0) { try { issuerAltNameExt = new IssuerAlternativeNameExtension( - Boolean.valueOf(critical), names); + Boolean.valueOf(critical), names); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_ISSUER_ALT_NAME_EXT", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_ISSUER_ALT_NAME_EXT", e.toString())); } } } @@ -195,8 +214,8 @@ public class CMSIssuerAlternativeNameExtension try { numNames = config.getInteger("numNames", 0); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, "Invalid numNames property for CRL " + - "IssuerAlternativeName extension - " + e); + log(ILogger.LL_FAILURE, "Invalid numNames property for CRL " + + "IssuerAlternativeName extension - " + e); } nvp.add("numNames", String.valueOf(numNames)); @@ -206,11 +225,13 @@ public class CMSIssuerAlternativeNameExtension try { nameType = config.getString("nameType" + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, "Undefined nameType" + i + " property for " + - "CRL IssuerAlternativeName extension - " + e); + log(ILogger.LL_FAILURE, "Undefined nameType" + i + + " property for " + + "CRL IssuerAlternativeName extension - " + e); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, "Invalid nameType" + i + " property for " + - "CRL IssuerAlternativeName extension - " + e); + log(ILogger.LL_FAILURE, "Invalid nameType" + i + + " property for " + + "CRL IssuerAlternativeName extension - " + e); } if (nameType != null && nameType.length() > 0) { @@ -224,11 +245,11 @@ public class CMSIssuerAlternativeNameExtension try { name = config.getString("name" + i); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, "Undefined name" + i + " property for " + - "CRL IssuerAlternativeName extension - " + e); + log(ILogger.LL_FAILURE, "Undefined name" + i + " property for " + + "CRL IssuerAlternativeName extension - " + e); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, "Invalid name" + i + " property for " + - "CRL IssuerAlternativeName extension - " + e); + log(ILogger.LL_FAILURE, "Invalid name" + i + " property for " + + "CRL IssuerAlternativeName extension - " + e); } if (name != null && name.length() > 0) { @@ -248,35 +269,40 @@ 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.", + "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.", "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.", + "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.", "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.", + "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.", "name2;string;Enter Issuer Alternative Name corresponding to the selected name type.", - IExtendedPluginInfo.HELP_TOKEN + - ";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." - }; + IExtendedPluginInfo.HELP_TOKEN + + ";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." }; return params; } 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 ccc5b64d0..4109e10f5 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 { +public class CMSIssuingDistributionPointExtension 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,33 +59,25 @@ public class CMSIssuingDistributionPointExtension public static final String PROP_INDIRECT = "indirectCRL"; public static final String PROP_REASONS = "onlySomeReasons"; - private static final String[] reasonFlags = {"unused", - "keyCompromise", - "cACompromise", - "affiliationChanged", - "superseded", - "cessationOfOperation", - "certificateHold", - "privilegeWithdrawn"}; + private static final String[] reasonFlags = { "unused", "keyCompromise", + "cACompromise", "affiliationChanged", "superseded", + "cessationOfOperation", "certificateHold", "privilegeWithdrawn" }; private ILogger mLogger = CMS.getLogger(); public CMSIssuingDistributionPointExtension() { } - public Extension setCRLExtensionCriticality(Extension ext, - boolean critical) { - IssuingDistributionPointExtension issuingDPointExt = - (IssuingDistributionPointExtension) ext; + public Extension setCRLExtensionCriticality(Extension ext, boolean critical) { + IssuingDistributionPointExtension issuingDPointExt = (IssuingDistributionPointExtension) ext; issuingDPointExt.setCritical(critical); return issuingDPointExt; } - public Extension getCRLExtension(IConfigStore config, - Object ip, - boolean critical) { + public Extension getCRLExtension(IConfigStore config, Object ip, + boolean critical) { CMS.debug("in CMSIssuingDistributionPointExtension::getCRLExtension."); ICRLIssuingPoint crlIssuingPoint = (ICRLIssuingPoint) ip; @@ -102,9 +92,13 @@ public class CMSIssuingDistributionPointExtension try { pointType = config.getString(PROP_POINTTYPE); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", + e.toString())); } if (pointType != null) { @@ -113,9 +107,13 @@ public class CMSIssuingDistributionPointExtension try { pointName = config.getString(PROP_POINTNAME); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", + e.toString())); } if (pointName != null && pointName.length() > 0) { @@ -123,7 +121,9 @@ public class CMSIssuingDistributionPointExtension try { rdnName = new RDN(pointName); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_RDN", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_RDN", + e.toString())); } } else if (pointType.equalsIgnoreCase(PROP_DIRNAME)) { try { @@ -131,14 +131,16 @@ public class CMSIssuingDistributionPointExtension names.addElement(dirName); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_INVALID_500NAME", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_CREATE_INVALID_500NAME", e.toString())); } } else if (pointType.equalsIgnoreCase(PROP_URINAME)) { URIName uriName = new URIName(pointName); names.addElement(uriName); } else { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_POTINT_TYPE", pointType)); + log(ILogger.LL_FAILURE, CMS.getLogMessage( + "CRL_INVALID_POTINT_TYPE", pointType)); } } } @@ -149,9 +151,11 @@ public class CMSIssuingDistributionPointExtension try { issuingDPoint.setFullName(names); } catch (IOException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CANNOT_SET_NAME", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CANNOT_SET_NAME", e.toString())); } catch (GeneralNamesException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CANNOT_SET_NAME", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CANNOT_SET_NAME", e.toString())); } } @@ -160,11 +164,13 @@ public class CMSIssuingDistributionPointExtension try { reasons = config.getString(PROP_REASONS, null); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", PROP_REASONS, e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_INVALID_PROPERTY", PROP_REASONS, + e.toString())); } 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, ","); @@ -193,7 +199,9 @@ public class CMSIssuingDistributionPointExtension if (caCertsOnly) issuingDPoint.setOnlyContainsCACerts(caCertsOnly); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", "caCertsOnly", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_INVALID_PROPERTY", "caCertsOnly", + e.toString())); } try { boolean userCertsOnly = config.getBoolean(PROP_USERCERTS, false); @@ -201,7 +209,8 @@ public class CMSIssuingDistributionPointExtension if (userCertsOnly) issuingDPoint.setOnlyContainsUserCerts(userCertsOnly); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", "userCertsOnly", e.toString())); + log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", + "userCertsOnly", e.toString())); } try { boolean indirectCRL = config.getBoolean(PROP_INDIRECT, false); @@ -209,7 +218,9 @@ public class CMSIssuingDistributionPointExtension if (indirectCRL) issuingDPoint.setIndirectCRL(indirectCRL); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", "indirectCRL", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_INVALID_PROPERTY", "indirectCRL", + e.toString())); } issuingDPointExt = new IssuingDistributionPointExtension(issuingDPoint); @@ -228,9 +239,13 @@ public class CMSIssuingDistributionPointExtension try { pointType = config.getString(PROP_POINTTYPE); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", + e.toString())); } if (pointType != null && pointType.length() > 0) { nvp.add("pointType", pointType); @@ -243,9 +258,13 @@ public class CMSIssuingDistributionPointExtension try { pointName = config.getString(PROP_POINTNAME); } catch (EPropertyNotFound e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_UNDEFINED", + e.toString())); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_CREATE_DIST_POINT_INVALID", + e.toString())); } if (pointName != null && pointName.length() > 0) { nvp.add("pointName", pointName); @@ -258,7 +277,9 @@ public class CMSIssuingDistributionPointExtension try { reasons = config.getString(PROP_REASONS, null); } catch (EBaseException e) { - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", PROP_REASONS, e.toString())); + log(ILogger.LL_FAILURE, + CMS.getLogMessage("CRL_INVALID_PROPERTY", PROP_REASONS, + e.toString())); } if (reasons != null && reasons.length() > 0) { nvp.add(PROP_REASONS, reasons); @@ -272,28 +293,27 @@ public class CMSIssuingDistributionPointExtension nvp.add(PROP_CACERTS, String.valueOf(caCertsOnly)); } catch (EBaseException e) { nvp.add(PROP_CACERTS, "false"); - log(ILogger.LL_FAILURE, CMS.getLogMessage("CRL_INVALID_PROPERTY", "caCertsOnly", e.toString())); + 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,32 +325,36 @@ 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_POINTNAME + ";string;Enter Issuing Distribution Point name " + - "corresponding to the selected point type.", - PROP_REASONS + ";string;Select any combination of the following reasons: " + - 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.", - IExtendedPluginInfo.HELP_TOKEN + - ";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." - }; + PROP_POINTTYPE + ";choice(" + PROP_DIRNAME + "," + PROP_URINAME + + "," + PROP_RDNNAME + + ");Select Issuing Distribution Point name type.", + PROP_POINTNAME + + ";string;Enter Issuing Distribution Point name " + + "corresponding to the selected point type.", + PROP_REASONS + + ";string;Select any combination of the following reasons: " + + 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.", + IExtendedPluginInfo.HELP_TOKEN + + ";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." }; return params; } private void log(int level, String msg) { mLogger.log(ILogger.EV_SYSTEM, null, ILogger.S_CA, level, - "CMSIssuingDistributionPointExtension - " + msg); + "CMSIssuingDistributionPointExtension - " + msg); } -} +} |