Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 164 insertions, 382 deletions

diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
index 1952ba168..56ec0adf1 100644
--- a/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
+++ b/pki/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cms.profile.constraint;
 
+
 import java.math.BigInteger;
 import java.security.interfaces.DSAParams;
 import java.util.HashMap;
@@ -43,9 +44,11 @@ import com.netscape.certsrv.request.IRequest;
 import com.netscape.cms.profile.def.NoDefault;
 import com.netscape.cms.profile.def.UserKeyDefault;
 
+
 /**
- * This constraint is to check the key type and key length.
- * 
+ * This constraint is to check the key type and
+ * key length.
+ *
  * @version $Revision$, $Date$
  */
 @SuppressWarnings("serial")
@@ -54,306 +57,72 @@ public class KeyConstraint extends EnrollConstraint {
     public static final String CONFIG_KEY_TYPE = "keyType"; // (EC, RSA)
     public static final String CONFIG_KEY_PARAMETERS = "keyParameters";
 
-    private static final String[] ecCurves = { "nistp256", "nistp384",
-            "nistp521", "sect163k1", "nistk163", "sect163r1", "sect163r2",
-            "nistb163", "sect193r1", "sect193r2", "sect233k1", "nistk233",
-            "sect233r1", "nistb233", "sect239k1", "sect283k1", "nistk283",
-            "sect283r1", "nistb283", "sect409k1", "nistk409", "sect409r1",
-            "nistb409", "sect571k1", "nistk571", "sect571r1", "nistb571",
-            "secp160k1", "secp160r1", "secp160r2", "secp192k1", "secp192r1",
-            "nistp192", "secp224k1", "secp224r1", "nistp224", "secp256k1",
-            "secp256r1", "secp384r1", "secp521r1", "prime192v1", "prime192v2",
-            "prime192v3", "prime239v1", "prime239v2", "prime239v3",
-            "c2pnb163v1", "c2pnb163v2", "c2pnb163v3", "c2pnb176v1",
-            "c2tnb191v1", "c2tnb191v2", "c2tnb191v3", "c2pnb208w1",
-            "c2tnb239v1", "c2tnb239v2", "c2tnb239v3", "c2pnb272w1",
-            "c2pnb304w1", "c2tnb359w1", "c2pnb368w1", "c2tnb431r1",
-            "secp112r1", "secp112r2", "secp128r1", "secp128r2", "sect113r1",
-            "sect113r2", "sect131r1", "sect131r2" };
-
-    private final static HashMap<String, Vector> ecOIDs = new HashMap<String, Vector>();
-    static {
-        ecOIDs.put("1.2.840.10045.3.1.7", new Vector() {
-            {
-                add("nistp256");
-                add("secp256r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.34", new Vector() {
-            {
-                add("nistp384");
-                add("secp384r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.35", new Vector() {
-            {
-                add("nistp521");
-                add("secp521r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.1", new Vector() {
-            {
-                add("sect163k1");
-                add("nistk163");
-            }
-        });
-        ecOIDs.put("1.3.132.0.2", new Vector() {
-            {
-                add("sect163r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.15", new Vector() {
-            {
-                add("sect163r2");
-                add("nistb163");
-            }
-        });
-        ecOIDs.put("1.3.132.0.24", new Vector() {
-            {
-                add("sect193r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.25", new Vector() {
-            {
-                add("sect193r2");
-            }
-        });
-        ecOIDs.put("1.3.132.0.26", new Vector() {
-            {
-                add("sect233k1");
-                add("nistk233");
-            }
-        });
-        ecOIDs.put("1.3.132.0.27", new Vector() {
-            {
-                add("sect233r1");
-                add("nistb233");
-            }
-        });
-        ecOIDs.put("1.3.132.0.3", new Vector() {
-            {
-                add("sect239k1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.16", new Vector() {
-            {
-                add("sect283k1");
-                add("nistk283");
-            }
-        });
-        ecOIDs.put("1.3.132.0.17", new Vector() {
-            {
-                add("sect283r1");
-                add("nistb283");
-            }
-        });
-        ecOIDs.put("1.3.132.0.36", new Vector() {
-            {
-                add("sect409k1");
-                add("nistk409");
-            }
-        });
-        ecOIDs.put("1.3.132.0.37", new Vector() {
-            {
-                add("sect409r1");
-                add("nistb409");
-            }
-        });
-        ecOIDs.put("1.3.132.0.38", new Vector() {
-            {
-                add("sect571k1");
-                add("nistk571");
-            }
-        });
-        ecOIDs.put("1.3.132.0.39", new Vector() {
-            {
-                add("sect571r1");
-                add("nistb571");
-            }
-        });
-        ecOIDs.put("1.3.132.0.9", new Vector() {
-            {
-                add("secp160k1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.8", new Vector() {
-            {
-                add("secp160r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.30", new Vector() {
-            {
-                add("secp160r2");
-            }
-        });
-        ecOIDs.put("1.3.132.0.31", new Vector() {
-            {
-                add("secp192k1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.1.1", new Vector() {
-            {
-                add("secp192r1");
-                add("nistp192");
-                add("prime192v1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.32", new Vector() {
-            {
-                add("secp224k1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.33", new Vector() {
-            {
-                add("secp224r1");
-                add("nistp224");
-            }
-        });
-        ecOIDs.put("1.3.132.0.10", new Vector() {
-            {
-                add("secp256k1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.1.2", new Vector() {
-            {
-                add("prime192v2");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.1.3", new Vector() {
-            {
-                add("prime192v3");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.1.4", new Vector() {
-            {
-                add("prime239v1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.1.5", new Vector() {
-            {
-                add("prime239v2");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.1.6", new Vector() {
-            {
-                add("prime239v3");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.1", new Vector() {
-            {
-                add("c2pnb163v1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.2", new Vector() {
-            {
-                add("c2pnb163v2");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.3", new Vector() {
-            {
-                add("c2pnb163v3");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.4", new Vector() {
-            {
-                add("c2pnb176v1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.5", new Vector() {
-            {
-                add("c2tnb191v1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.6", new Vector() {
-            {
-                add("c2tnb191v2");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.7", new Vector() {
-            {
-                add("c2tnb191v3");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.10", new Vector() {
-            {
-                add("c2pnb208w1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.11", new Vector() {
-            {
-                add("c2tnb239v1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.12", new Vector() {
-            {
-                add("c2tnb239v2");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.13", new Vector() {
-            {
-                add("c2tnb239v3");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.16", new Vector() {
-            {
-                add("c2pnb272w1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.17", new Vector() {
-            {
-                add("c2pnb304w1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.19", new Vector() {
-            {
-                add("c2pnb368w1");
-            }
-        });
-        ecOIDs.put("1.2.840.10045.3.0.20", new Vector() {
-            {
-                add("c2tnb431r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.6", new Vector() {
-            {
-                add("secp112r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.7", new Vector() {
-            {
-                add("secp112r2");
-            }
-        });
-        ecOIDs.put("1.3.132.0.28", new Vector() {
-            {
-                add("secp128r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.29", new Vector() {
-            {
-                add("secp128r2");
-            }
-        });
-        ecOIDs.put("1.3.132.0.4", new Vector() {
-            {
-                add("sect113r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.5", new Vector() {
-            {
-                add("sect113r2");
-            }
-        });
-        ecOIDs.put("1.3.132.0.22", new Vector() {
-            {
-                add("sect131r1");
-            }
-        });
-        ecOIDs.put("1.3.132.0.23", new Vector() {
-            {
-                add("sect131r2");
-            }
-        });
+    private static final String[] ecCurves = {"nistp256","nistp384","nistp521","sect163k1","nistk163","sect163r1","sect163r2",
+       "nistb163","sect193r1","sect193r2","sect233k1","nistk233","sect233r1","nistb233","sect239k1","sect283k1","nistk283",
+       "sect283r1","nistb283","sect409k1","nistk409","sect409r1","nistb409","sect571k1","nistk571","sect571r1","nistb571",
+       "secp160k1","secp160r1","secp160r2","secp192k1","secp192r1","nistp192","secp224k1","secp224r1","nistp224","secp256k1",
+       "secp256r1","secp384r1","secp521r1","prime192v1","prime192v2","prime192v3","prime239v1","prime239v2","prime239v3","c2pnb163v1",
+       "c2pnb163v2","c2pnb163v3","c2pnb176v1","c2tnb191v1","c2tnb191v2","c2tnb191v3","c2pnb208w1","c2tnb239v1","c2tnb239v2","c2tnb239v3",
+       "c2pnb272w1","c2pnb304w1","c2tnb359w1","c2pnb368w1","c2tnb431r1","secp112r1","secp112r2","secp128r1","secp128r2","sect113r1","sect113r2",
+       "sect131r1","sect131r2"
+    };
+
+    private final static HashMap<String,Vector> ecOIDs = new HashMap<String,Vector>();
+ 	static
+    {
+       ecOIDs.put( "1.2.840.10045.3.1.7",  new Vector() {{add("nistp256");add("secp256r1");}});
+       ecOIDs.put( "1.3.132.0.34",         new Vector() {{add("nistp384");add("secp384r1");}});
+       ecOIDs.put( "1.3.132.0.35",         new Vector() {{add("nistp521");add("secp521r1");}});
+       ecOIDs.put( "1.3.132.0.1",          new Vector() {{add("sect163k1");add("nistk163");}});
+       ecOIDs.put( "1.3.132.0.2",          new Vector() {{add("sect163r1");}});
+       ecOIDs.put( "1.3.132.0.15",         new Vector() {{add("sect163r2");add("nistb163");}});
+       ecOIDs.put( "1.3.132.0.24",         new Vector() {{add("sect193r1");}});
+       ecOIDs.put( "1.3.132.0.25",         new Vector() {{add("sect193r2");}});
+       ecOIDs.put( "1.3.132.0.26",         new Vector() {{add("sect233k1");add("nistk233");}});
+       ecOIDs.put( "1.3.132.0.27",         new Vector() {{add("sect233r1");add("nistb233");}});
+       ecOIDs.put( "1.3.132.0.3",         new Vector() {{add("sect239k1");}});
+       ecOIDs.put( "1.3.132.0.16",         new Vector() {{add("sect283k1");add("nistk283");}});
+       ecOIDs.put( "1.3.132.0.17",         new Vector() {{add("sect283r1");add("nistb283");}});
+       ecOIDs.put( "1.3.132.0.36",         new Vector() {{add("sect409k1");add("nistk409");}});
+       ecOIDs.put( "1.3.132.0.37",         new Vector() {{add("sect409r1");add("nistb409");}});
+       ecOIDs.put( "1.3.132.0.38",         new Vector() {{add("sect571k1"); add("nistk571");}});
+       ecOIDs.put( "1.3.132.0.39",         new Vector() {{add("sect571r1");add("nistb571");}});
+       ecOIDs.put( "1.3.132.0.9",          new Vector()  {{add("secp160k1");}});
+       ecOIDs.put( "1.3.132.0.8",          new Vector()  {{add("secp160r1");}});
+       ecOIDs.put( "1.3.132.0.30",         new Vector() {{add("secp160r2");}});
+       ecOIDs.put( "1.3.132.0.31",         new Vector() {{add("secp192k1");}});
+       ecOIDs.put( "1.2.840.10045.3.1.1",  new Vector() {{add("secp192r1");add("nistp192");add("prime192v1");}});
+       ecOIDs.put( "1.3.132.0.32",         new Vector() {{add("secp224k1");}});
+       ecOIDs.put( "1.3.132.0.33",         new Vector() {{add("secp224r1");add("nistp224");}});
+       ecOIDs.put( "1.3.132.0.10",         new Vector() {{add("secp256k1");}});
+       ecOIDs.put( "1.2.840.10045.3.1.2",new Vector() {{add("prime192v2");}});
+       ecOIDs.put( "1.2.840.10045.3.1.3",new Vector() {{add("prime192v3");}});
+       ecOIDs.put( "1.2.840.10045.3.1.4",new Vector() {{add("prime239v1");}});
+       ecOIDs.put( "1.2.840.10045.3.1.5",new Vector() {{add("prime239v2");}});
+       ecOIDs.put( "1.2.840.10045.3.1.6",new Vector() {{add("prime239v3");}});
+       ecOIDs.put( "1.2.840.10045.3.0.1",  new Vector() {{add("c2pnb163v1");}});
+       ecOIDs.put( "1.2.840.10045.3.0.2",  new Vector() {{add("c2pnb163v2");}});
+       ecOIDs.put( "1.2.840.10045.3.0.3",  new Vector() {{add("c2pnb163v3");}});
+       ecOIDs.put( "1.2.840.10045.3.0.4",  new Vector() {{add("c2pnb176v1");}});
+       ecOIDs.put( "1.2.840.10045.3.0.5",  new Vector() {{add("c2tnb191v1");}});
+       ecOIDs.put( "1.2.840.10045.3.0.6",  new Vector() {{add("c2tnb191v2");}});
+       ecOIDs.put( "1.2.840.10045.3.0.7",  new Vector() {{add("c2tnb191v3");}});
+       ecOIDs.put( "1.2.840.10045.3.0.10", new Vector() {{add("c2pnb208w1");}});
+       ecOIDs.put( "1.2.840.10045.3.0.11", new Vector() {{add("c2tnb239v1");}});
+       ecOIDs.put( "1.2.840.10045.3.0.12", new Vector() {{add("c2tnb239v2");}});
+       ecOIDs.put( "1.2.840.10045.3.0.13", new Vector() {{add("c2tnb239v3");}});
+       ecOIDs.put( "1.2.840.10045.3.0.16", new Vector() {{add("c2pnb272w1");}});
+       ecOIDs.put( "1.2.840.10045.3.0.17", new Vector() {{add("c2pnb304w1");}});
+       ecOIDs.put( "1.2.840.10045.3.0.19", new Vector() {{add("c2pnb368w1");}});
+       ecOIDs.put( "1.2.840.10045.3.0.20", new Vector() {{add("c2tnb431r1");}});
+       ecOIDs.put( "1.3.132.0.6",          new Vector() {{add("secp112r1");}});
+       ecOIDs.put( "1.3.132.0.7",          new Vector() {{add("secp112r2");}});
+       ecOIDs.put( "1.3.132.0.28",         new Vector() {{add("secp128r1");}});
+       ecOIDs.put( "1.3.132.0.29",         new Vector() {{add("secp128r2");}});
+       ecOIDs.put( "1.3.132.0.4",          new Vector() {{add("sect113r1");}});
+       ecOIDs.put( "1.3.132.0.5",          new Vector() {{add("sect113r2");}});
+       ecOIDs.put( "1.3.132.0.22",         new Vector() {{add("sect131r1");}});
+       ecOIDs.put( "1.3.132.0.23",         new Vector() {{add("sect131r2");}});
     }
 
     private static String[] cfgECCurves = null;
@@ -367,7 +136,7 @@ public class KeyConstraint extends EnrollConstraint {
     }
 
     public void init(IProfile profile, IConfigStore config)
-            throws EProfileException {
+        throws EProfileException {
         super.init(profile, config);
 
         String ecNames = "";
@@ -379,30 +148,32 @@ public class KeyConstraint extends EnrollConstraint {
         CMS.debug("KeyConstraint.init ecNames: " + ecNames);
         if (ecNames != null && ecNames.length() != 0) {
             cfgECCurves = ecNames.split(",");
-        }
+       }
     }
 
-    public IDescriptor getConfigDescriptor(Locale locale, String name) {
+    public IDescriptor getConfigDescriptor(Locale locale, String name) { 
         if (name.equals(CONFIG_KEY_TYPE)) {
-            return new Descriptor(IDescriptor.CHOICE, "-,RSA,EC", "RSA",
+            return new Descriptor(IDescriptor.CHOICE, "-,RSA,EC",
+                    "RSA",
                     CMS.getUserMessage(locale, "CMS_PROFILE_KEY_TYPE"));
-        } else if (name.equals(CONFIG_KEY_PARAMETERS)) {
-            return new Descriptor(IDescriptor.STRING, null, "",
-                    CMS.getUserMessage(locale, "CMS_PROFILE_KEY_PARAMETERS"));
+        }   else if (name.equals(CONFIG_KEY_PARAMETERS)) {
+            return new Descriptor(IDescriptor.STRING,null,"",
+                    CMS.getUserMessage(locale,"CMS_PROFILE_KEY_PARAMETERS"));
         }
 
         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 {
+        throws ERejectException { 
         try {
-            CertificateX509Key infokey = (CertificateX509Key) info
-                    .get(X509CertInfo.KEY);
-            X509Key key = (X509Key) infokey.get(CertificateX509Key.KEY);
+            CertificateX509Key infokey = (CertificateX509Key)
+                info.get(X509CertInfo.KEY);
+            X509Key key = (X509Key) infokey.get(CertificateX509Key.KEY); 
 
             String alg = key.getAlgorithmId().getName().toUpperCase();
             String value = getConfig(CONFIG_KEY_TYPE);
@@ -410,25 +181,29 @@ public class KeyConstraint extends EnrollConstraint {
 
             if (!isOptional(value)) {
                 if (!alg.equals(value)) {
-                    throw new ERejectException(CMS.getUserMessage(
-                            getLocale(request),
-                            "CMS_PROFILE_KEY_TYPE_NOT_MATCHED", value));
+                    throw new ERejectException(
+                            CMS.getUserMessage(
+                                getLocale(request),
+                                "CMS_PROFILE_KEY_TYPE_NOT_MATCHED", 
+                                value));
                 }
             }
 
             int keySize = 0;
             String ecCurve = "";
 
-            if (alg.equals("RSA")) {
+            if (alg.equals("RSA")) { 
                 keySize = getRSAKeyLen(key);
-            } else if (alg.equals("DSA")) {
+            } else if (alg.equals("DSA")) { 
                 keySize = getDSAKeyLen(key);
-            } else if (alg.equals("EC")) {
-                // EC key case.
+            } else if (alg.equals("EC")) { 
+                //EC key case.
             } else {
-                throw new ERejectException(
-                        CMS.getUserMessage(getLocale(request),
-                                "CMS_PROFILE_INVALID_KEY_TYPE", alg));
+                throw new ERejectException(	
+                        CMS.getUserMessage(
+                            getLocale(request),
+                            "CMS_PROFILE_INVALID_KEY_TYPE",
+                            alg));
             }
 
             value = getConfig(CONFIG_KEY_PARAMETERS);
@@ -437,26 +212,28 @@ public class KeyConstraint extends EnrollConstraint {
 
             if (alg.equals("EC")) {
                 if (!alg.equals(keyType) && !isOptional(keyType)) {
-                    throw new ERejectException(CMS.getUserMessage(
-                            getLocale(request),
-                            "CMS_PROFILE_KEY_PARAMS_NOT_MATCHED", value));
+                    throw new ERejectException(
+                            CMS.getUserMessage(
+                                getLocale(request),
+                                "CMS_PROFILE_KEY_PARAMS_NOT_MATCHED",
+                                value));
                 }
 
                 AlgorithmId algid = key.getAlgorithmId();
 
                 CMS.debug("algId: " + algid);
 
-                // Get raw string representation of alg parameters, will give
-                // us the curve OID.
+                //Get raw string representation of alg parameters, will give 
+                //us the curve OID.
 
-                String params = null;
+                String params =  null;
                 if (algid != null) {
                     params = algid.getParametersString();
                 }
 
                 if (params.startsWith("OID.")) {
                     params = params.substring(4);
-                }
+                } 
 
                 CMS.debug("EC key OID: " + params);
                 Vector vect = ecOIDs.get(params);
@@ -467,12 +244,10 @@ public class KeyConstraint extends EnrollConstraint {
                     CMS.debug("vect: " + vect.toString());
 
                     if (!isOptional(keyType)) {
-                        // Check the curve parameters only if explicit ECC or
-                        // not optional
-                        for (int i = 0; i < keyParams.length; i++) {
-                            String ecParam = keyParams[i];
-                            CMS.debug("keyParams[i]: " + i + " param: "
-                                    + ecParam);
+                        //Check the curve parameters only if explicit ECC or not optional
+                        for (int i = 0 ; i < keyParams.length ; i ++) {
+                            String ecParam =  keyParams[i];
+                            CMS.debug("keyParams[i]: " + i + " param: " + ecParam);
                             if (vect.contains(ecParam)) {
                                 curveFound = true;
                                 CMS.debug("KeyConstraint.validate: EC key constrainst passed.");
@@ -485,17 +260,21 @@ public class KeyConstraint extends EnrollConstraint {
                 }
 
                 if (!curveFound) {
-                    CMS.debug("KeyConstraint.validate: EC key constrainst failed.");
-                    throw new ERejectException(CMS.getUserMessage(
-                            getLocale(request),
-                            "CMS_PROFILE_KEY_PARAMS_NOT_MATCHED", value));
+                     CMS.debug("KeyConstraint.validate: EC key constrainst failed.");
+                    throw new ERejectException(
+                            CMS.getUserMessage(
+                                getLocale(request),
+                                "CMS_PROFILE_KEY_PARAMS_NOT_MATCHED",
+                                value));
                 }
 
-            } else {
-                if (!arrayContainsString(keyParams, Integer.toString(keySize))) {
-                    throw new ERejectException(CMS.getUserMessage(
-                            getLocale(request),
-                            "CMS_PROFILE_KEY_PARAMS_NOT_MATCHED", value));
+            }  else {
+                if ( !arrayContainsString(keyParams,Integer.toString(keySize))) {
+                     throw new ERejectException(
+                            CMS.getUserMessage(
+                                getLocale(request),
+                                "CMS_PROFILE_KEY_PARAMS_NOT_MATCHED",
+                                value));
                 }
                 CMS.debug("KeyConstraint.validate: RSA key contraints passed.");
             }
@@ -504,8 +283,8 @@ public class KeyConstraint extends EnrollConstraint {
                 throw (ERejectException) e;
             }
             CMS.debug("KeyConstraint: " + e.toString());
-            throw new ERejectException(CMS.getUserMessage(getLocale(request),
-                    "CMS_PROFILE_KEY_NOT_FOUND"));
+            throw new ERejectException(CMS.getUserMessage(
+                        getLocale(request), "CMS_PROFILE_KEY_NOT_FOUND"));
         }
     }
 
@@ -513,7 +292,8 @@ public class KeyConstraint extends EnrollConstraint {
         X509Key newkey = null;
 
         try {
-            newkey = new X509Key(AlgorithmId.get("RSA"), key.getKey());
+            newkey = new X509Key(AlgorithmId.get("RSA"),
+                        key.getKey());
         } catch (Exception e) {
             CMS.debug("KeyConstraint: getRSAKey Len " + e.toString());
             return -1;
@@ -535,11 +315,13 @@ public class KeyConstraint extends EnrollConstraint {
     }
 
     public String getText(Locale locale) {
-        String params[] = { getConfig(CONFIG_KEY_TYPE),
-                getConfig(CONFIG_KEY_PARAMETERS) };
+        String params[] = {
+                getConfig(CONFIG_KEY_TYPE),
+                getConfig(CONFIG_KEY_PARAMETERS)
+            };
 
-        return CMS.getUserMessage(locale, "CMS_PROFILE_CONSTRAINT_KEY_TEXT",
-                params);
+        return CMS.getUserMessage(locale, 
+                "CMS_PROFILE_CONSTRAINT_KEY_TEXT", params);
     }
 
     public boolean isApplicable(IPolicyDefault def) {
@@ -550,27 +332,28 @@ public class KeyConstraint extends EnrollConstraint {
         return false;
     }
 
-    public void setConfig(String name, String value) throws EPropertyException {
+    public void setConfig(String name, String value)
+        throws EPropertyException {
 
         CMS.debug("KeyConstraint.setConfig name: " + name + " value: " + value);
-        // establish keyType, we don't know which order these params will arrive
+        //establish keyType, we don't know which order these params will arrive
         if (name.equals(CONFIG_KEY_TYPE)) {
             keyType = value;
-            if (keyParams.equals(""))
-                return;
+            if(keyParams.equals(""))
+               return;
         }
-
-        // establish keyParams
+        
+        //establish keyParams
         if (name.equals(CONFIG_KEY_PARAMETERS)) {
             CMS.debug("establish keyParams: " + value);
             keyParams = value;
 
-            if (keyType.equals(""))
+            if(keyType.equals(""))
                 return;
         }
-        // All the params we need for validation have been collected,
+        // All the params we need for validation have been collected, 
         // we don't know which order they will show up
-        if (keyType.length() > 0 && keyParams.length() > 0) {
+        if (keyType.length() > 0  && keyParams.length() > 0) {
             String[] params = keyParams.split(",");
             boolean isECCurve = false;
             int keySize = 0;
@@ -578,50 +361,48 @@ public class KeyConstraint extends EnrollConstraint {
             for (int i = 0; i < params.length; i++) {
                 if (keyType.equals("EC")) {
                     if (cfgECCurves == null) {
-                        // Use the static array as a backup if the config values
-                        // are not present.
-                        isECCurve = arrayContainsString(ecCurves, params[i]);
+                        //Use the static array as a backup if the config values are not present.
+                        isECCurve = arrayContainsString(ecCurves,params[i]);
                     } else {
-                        isECCurve = arrayContainsString(cfgECCurves, params[i]);
+                        isECCurve = arrayContainsString(cfgECCurves,params[i]);
                     }
-                    if (isECCurve == false) { // Not a valid EC curve throw
-                                              // exception.
+                    if (isECCurve == false) { //Not a valid EC curve throw exception.
                         keyType = "";
                         keyParams = "";
                         throw new EPropertyException(CMS.getUserMessage(
-                                "CMS_INVALID_PROPERTY", name));
+                            "CMS_INVALID_PROPERTY", name));
                     }
-                } else {
+                }  else {
                     try {
                         keySize = Integer.parseInt(params[i]);
                     } catch (Exception e) {
                         keySize = 0;
                     }
-                    if (keySize <= 0) {
+                    if (keySize <=  0) {
                         keyType = "";
                         keyParams = "";
                         throw new EPropertyException(CMS.getUserMessage(
-                                "CMS_INVALID_PROPERTY", name));
+                            "CMS_INVALID_PROPERTY", name));
                     }
                 }
             }
-        }
-        // Actually set the configuration in the profile
-        super.setConfig(CONFIG_KEY_TYPE, keyType);
-        super.setConfig(CONFIG_KEY_PARAMETERS, keyParams);
+       }
+       //Actually set the configuration in the profile
+       super.setConfig(CONFIG_KEY_TYPE, keyType);
+       super.setConfig(CONFIG_KEY_PARAMETERS, keyParams);
 
-        // Reset the vars for next round.
-        keyType = "";
-        keyParams = "";
+       //Reset the vars for next round.
+       keyType = "";
+       keyParams = "";
     }
 
     private boolean arrayContainsString(String[] array, String value) {
 
         if (array == null || value == null) {
-            return false;
-        }
+           return false;
+        } 
 
-        for (int i = 0; i < array.length; i++) {
+        for (int i = 0 ; i < array.length; i++) {
             if (array[i].equals(value)) {
                 return true;
             }
@@ -630,3 +411,4 @@ public class KeyConstraint extends EnrollConstraint {
         return false;
     }
 }
+