summaryrefslogtreecommitdiffstats
path: root/pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java')
-rw-r--r--pki/base/common/src/com/netscape/cms/crl/CMSIssuerAlternativeNameExtension.java136
1 files changed, 81 insertions, 55 deletions
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);
}
-}
+}