1 files changed, 29 insertions, 45 deletions

diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
index 539f4890..88cfb542 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
+++ b/pki/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java
@@ -17,7 +17,6 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.constraint;
 
-
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.StringTokenizer;
@@ -40,19 +39,17 @@ import com.netscape.cms.profile.def.ExtendedKeyUsageExtDefault;
 import com.netscape.cms.profile.def.NoDefault;
 import com.netscape.cms.profile.def.UserExtensionDefault;
 
-
 /**
- * This class implements the extended key usage extension constraint.
- * It checks if the extended key usage extension in the certificate
- * template satisfies the criteria.
- *
+ * This class implements the extended key usage extension constraint. It checks
+ * if the extended key usage extension in the certificate template satisfies the
+ * criteria.
+ * 
  * @version $Revision$, $Date$
  */
 public class ExtendedKeyUsageExtConstraint extends EnrollConstraint {
 
     public static final String CONFIG_CRITICAL = "exKeyUsageCritical";
-    public static final String CONFIG_OIDS =
-        "exKeyUsageOIDs";
+    public static final String CONFIG_OIDS = "exKeyUsageOIDs";
 
     public ExtendedKeyUsageExtConstraint() {
         super();
@@ -61,38 +58,33 @@ public class ExtendedKeyUsageExtConstraint extends EnrollConstraint {
     }
 
     public void init(IProfile profile, IConfigStore config)
-        throws EProfileException {
+            throws EProfileException {
         super.init(profile, config);
     }
 
-    public IDescriptor getConfigDescriptor(Locale locale, String name) { 
-        if (name.equals(CONFIG_CRITICAL)) { 
-            return new Descriptor(IDescriptor.CHOICE, "true,false,-", 
-                    "-",	
+    public IDescriptor getConfigDescriptor(Locale locale, String name) {
+        if (name.equals(CONFIG_CRITICAL)) {
+            return new Descriptor(IDescriptor.CHOICE, "true,false,-", "-",
                     CMS.getUserMessage(locale, "CMS_PROFILE_CRITICAL"));
         } else if (name.equals(CONFIG_OIDS)) {
-            return new Descriptor(IDescriptor.STRING, null, 
-                    null,
+            return new Descriptor(IDescriptor.STRING, null, null,
                     CMS.getUserMessage(locale, "CMS_PROFILE_OIDS"));
-        }	
+        }
         return null;
     }
 
     /**
-     * Validates the request. The request is not modified
-     * during the validation.
+     * Validates the request. The request is not modified during the validation.
      */
     public void validate(IRequest request, X509CertInfo info)
-        throws ERejectException {
-        ExtendedKeyUsageExtension ext = (ExtendedKeyUsageExtension)
-            getExtension(ExtendedKeyUsageExtension.OID, info); 
+            throws ERejectException {
+        ExtendedKeyUsageExtension ext = (ExtendedKeyUsageExtension) getExtension(
+                ExtendedKeyUsageExtension.OID, info);
 
         if (ext == null) {
-            throw new ERejectException(
-                    CMS.getUserMessage(
-                        getLocale(request),
-                        "CMS_PROFILE_EXTENSION_NOT_FOUND",
-                        ExtendedKeyUsageExtension.OID));
+            throw new ERejectException(CMS.getUserMessage(getLocale(request),
+                    "CMS_PROFILE_EXTENSION_NOT_FOUND",
+                    ExtendedKeyUsageExtension.OID));
         }
 
         // check criticality
@@ -102,12 +94,10 @@ public class ExtendedKeyUsageExtConstraint extends EnrollConstraint {
             boolean critical = getBoolean(value);
 
             if (critical != ext.isCritical()) {
-                throw new ERejectException(
-                        CMS.getUserMessage(
-                            getLocale(request),
-                            "CMS_PROFILE_CRITICAL_NOT_MATCHED"));
+                throw new ERejectException(CMS.getUserMessage(
+                        getLocale(request), "CMS_PROFILE_CRITICAL_NOT_MATCHED"));
             }
-        } 
+        }
 
         // Build local cache of configured OIDs
         Vector mCache = new Vector();
@@ -122,28 +112,22 @@ public class ExtendedKeyUsageExtConstraint extends EnrollConstraint {
         // check OIDs
         Enumeration e = ext.getOIDs();
 
-        while (e.hasMoreElements()) { 
+        while (e.hasMoreElements()) {
             ObjectIdentifier oid = (ObjectIdentifier) e.nextElement();
 
             if (!mCache.contains(oid.toString())) {
-                throw new ERejectException(
-                        CMS.getUserMessage(
-                            getLocale(request),
-                            "CMS_PROFILE_OID_NOT_MATCHED",
-                            oid.toString()));
+                throw new ERejectException(CMS.getUserMessage(
+                        getLocale(request), "CMS_PROFILE_OID_NOT_MATCHED",
+                        oid.toString()));
             }
         }
     }
 
     public String getText(Locale locale) {
-        String params[] = {
-                getConfig(CONFIG_CRITICAL),
-                getConfig(CONFIG_OIDS)
-            };
-
-        return CMS.getUserMessage(locale, 
-                "CMS_PROFILE_CONSTRAINT_EXTENDED_KEY_EXT_TEXT",
-                params);
+        String params[] = { getConfig(CONFIG_CRITICAL), getConfig(CONFIG_OIDS) };
+
+        return CMS.getUserMessage(locale,
+                "CMS_PROFILE_CONSTRAINT_EXTENDED_KEY_EXT_TEXT", params);
     }
 
     public boolean isApplicable(IPolicyDefault def) {