diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore/extensions')
| -rw-r--r-- | pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java | 27 | ||||
| -rw-r--r-- | pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java | 63 |
2 files changed, 44 insertions, 46 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java b/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java index b0fe0432..21377288 100644 --- a/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java +++ b/pki/base/common/src/com/netscape/cmscore/extensions/CMSExtensionsMap.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.extensions; - import java.util.Enumeration; import java.util.Hashtable; @@ -30,9 +29,8 @@ import com.netscape.certsrv.base.ISubsystem; import com.netscape.certsrv.extensions.EExtensionsException; import com.netscape.certsrv.extensions.ICMSExtension; - -/** - * Loads extension classes from configuration file and return +/** + * Loads extension classes from configuration file and return * for a given extension name or OID. */ public class CMSExtensionsMap implements ISubsystem { @@ -56,10 +54,11 @@ public class CMSExtensionsMap implements ISubsystem { /** * Create extensions from configuration store. + * * @param config the configuration store. */ - public void init(ISubsystem owner, IConfigStore config) - throws EBaseException { + public void init(ISubsystem owner, IConfigStore config) + throws EBaseException { mOwner = owner; mConfig = config; @@ -82,11 +81,11 @@ public class CMSExtensionsMap implements ISubsystem { } catch (IllegalAccessException e) { throw new EExtensionsException( CMS.getUserMessage("CMS_EXTENSION_INSTANTIATE_ERROR", - className, e.toString())); + className, e.toString())); } catch (InstantiationException e) { throw new EExtensionsException( CMS.getUserMessage("CMS_EXTENSION_INSTANTIATE_ERROR", - className, e.toString())); + className, e.toString())); } catch (ClassCastException e) { throw new EExtensionsException( CMS.getUserMessage("CMS_EXTENSION_INVALID_IMPL", className)); @@ -101,7 +100,7 @@ public class CMSExtensionsMap implements ISubsystem { if (name == null || oid == null) { throw new EExtensionsException( CMS.getUserMessage("CMS_EXTENSION_INCORRECT_IMPL", - ext.getClass().getName())); + ext.getClass().getName())); } mName2Ext.put(name, ext); mOID2Ext.put(oid.toString(), ext); @@ -120,29 +119,30 @@ public class CMSExtensionsMap implements ISubsystem { } /** - * Get configuration store. + * Get configuration store. */ public IConfigStore getConfigStore() { return mConfig; } /** - * Returns subsystem ID + * Returns subsystem ID */ public String getId() { return ID; } /** - * sets subsystem ID + * sets subsystem ID */ public void setId(String Id) { } /** * Get the extension class by name. + * * @param name name of the extension - * @return the extension class. + * @return the extension class. */ public ICMSExtension getByName(String name) { return (ICMSExtension) mName2Ext.get(name); @@ -150,6 +150,7 @@ public class CMSExtensionsMap implements ISubsystem { /** * Get the extension class by its OID. + * * @param oid - the OID of the extension. * @return the extension class. */ diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java b/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java index 9b8e16cf..bba95949 100644 --- a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java +++ b/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.extensions; - import java.io.IOException; import netscape.security.util.DerOutputStream; @@ -36,7 +35,6 @@ import com.netscape.certsrv.extensions.ICMSExtension; import com.netscape.certsrv.logging.ILogger; import com.netscape.cmscore.util.Debug; - public class KeyUsage implements ICMSExtension { private final static String NAME = "KeyUsageExtension"; private final static ObjectIdentifier OID = PKIXExtensions.KeyUsage_Id; @@ -49,24 +47,24 @@ public class KeyUsage implements ICMSExtension { public KeyUsage(boolean setDefault) { mSetDefault = setDefault; mLogger = CMS.getLogger(); - } + } - public void init(ISubsystem owner, IConfigStore config) - throws EBaseException { + public void init(ISubsystem owner, IConfigStore config) + throws EBaseException { // nothing to do here. mConfig = config; } - public String getName() { - return NAME; + public String getName() { + return NAME; } - public ObjectIdentifier getOID() { - return OID; + public ObjectIdentifier getOID() { + return OID; } - protected static final boolean[] DEF_BITS = - new boolean[KeyUsageExtension.NBITS]; + protected static final boolean[] DEF_BITS = + new boolean[KeyUsageExtension.NBITS]; static { // set default bits used when request missing key usage info. @@ -84,10 +82,10 @@ public class KeyUsage implements ICMSExtension { private static boolean getBoolean(Object value) { String val = (String) value; - if (val != null && - (val.equalsIgnoreCase("true") || val.equalsIgnoreCase("on"))) + if (val != null && + (val.equalsIgnoreCase("true") || val.equalsIgnoreCase("on"))) return true; - else + else return false; } @@ -120,13 +118,13 @@ public class KeyUsage implements ICMSExtension { int i; for (i = 0; i < KeyUsageExtension.NBITS; i++) { - if (values[i] != null && (values[i] instanceof String)) + if (values[i] != null && (values[i] instanceof String)) break; } if (i == KeyUsageExtension.NBITS && mSetDefault) { // no key usage extension parameters are requested. set default. CMS.debug( - "No Key usage bits requested. Setting default."); + "No Key usage bits requested. Setting default."); bits = DEF_BITS; } else { bit = KeyUsageExtension.DIGITAL_SIGNATURE_BIT; @@ -171,15 +169,15 @@ public class KeyUsage implements ICMSExtension { int j = 0; for (j = 0; j < bits.length; j++) { - if (bits[j]) + if (bits[j]) break; } if (j == bits.length) { - if (!mSetDefault) + if (!mSetDefault) return null; - else + else bits = DEF_BITS; - } + } return new KeyUsageExtension(bits); } catch (IOException e) { throw new EExtensionsException( @@ -188,7 +186,7 @@ public class KeyUsage implements ICMSExtension { } public IArgBlock getFormParams(Extension extension) - throws EBaseException { + throws EBaseException { KeyUsageExtension ext = null; if (!extension.getExtensionId().equals(PKIXExtensions.KeyUsage_Id)) { @@ -210,26 +208,25 @@ public class KeyUsage implements ICMSExtension { IArgBlock params = CMS.createArgBlock(); boolean[] bits = ext.getBits(); - params.set(KeyUsageExtension.DIGITAL_SIGNATURE, - String.valueOf(bits[KeyUsageExtension.DIGITAL_SIGNATURE_BIT])); + params.set(KeyUsageExtension.DIGITAL_SIGNATURE, + String.valueOf(bits[KeyUsageExtension.DIGITAL_SIGNATURE_BIT])); params.set(KeyUsageExtension.NON_REPUDIATION, - String.valueOf(bits[KeyUsageExtension.NON_REPUDIATION_BIT])); + String.valueOf(bits[KeyUsageExtension.NON_REPUDIATION_BIT])); params.set(KeyUsageExtension.KEY_ENCIPHERMENT, - String.valueOf(bits[KeyUsageExtension.KEY_ENCIPHERMENT_BIT])); + String.valueOf(bits[KeyUsageExtension.KEY_ENCIPHERMENT_BIT])); params.set(KeyUsageExtension.DATA_ENCIPHERMENT, - String.valueOf(bits[KeyUsageExtension.DATA_ENCIPHERMENT_BIT])); + String.valueOf(bits[KeyUsageExtension.DATA_ENCIPHERMENT_BIT])); params.set(KeyUsageExtension.KEY_AGREEMENT, - String.valueOf(bits[KeyUsageExtension.KEY_AGREEMENT_BIT])); + String.valueOf(bits[KeyUsageExtension.KEY_AGREEMENT_BIT])); params.set(KeyUsageExtension.KEY_CERTSIGN, - String.valueOf(bits[KeyUsageExtension.KEY_CERTSIGN_BIT])); + String.valueOf(bits[KeyUsageExtension.KEY_CERTSIGN_BIT])); params.set(KeyUsageExtension.CRL_SIGN, - String.valueOf(bits[KeyUsageExtension.CRL_SIGN_BIT])); - params.set(KeyUsageExtension.ENCIPHER_ONLY, - String.valueOf(bits[KeyUsageExtension.ENCIPHER_ONLY_BIT])); + String.valueOf(bits[KeyUsageExtension.CRL_SIGN_BIT])); + params.set(KeyUsageExtension.ENCIPHER_ONLY, + String.valueOf(bits[KeyUsageExtension.ENCIPHER_ONLY_BIT])); params.set(KeyUsageExtension.DECIPHER_ONLY, - String.valueOf(bits[KeyUsageExtension.DECIPHER_ONLY_BIT])); + String.valueOf(bits[KeyUsageExtension.DECIPHER_ONLY_BIT])); return params; } } - |