diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-05 14:49:11 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-04-09 10:03:25 -0500 |
| commit | 7c7b9d023cd466c1771068badc020dab36beb553 (patch) | |
| tree | 178877eb83e25336be7577953945fbdb0b9e1a15 /base/common/src/com/netscape/cms/policy | |
| parent | da1e6e2f49f66fd46c8039ff1aa4386309fba8f4 (diff) | |
| download | pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.gz pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.xz pki-7c7b9d023cd466c1771068badc020dab36beb553.zip | |
Removed whitespaces from Java code.
Whitespaces in Java code have been removed with the following command:
find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \;
Ticket #134
Diffstat (limited to 'base/common/src/com/netscape/cms/policy')
41 files changed, 390 insertions, 390 deletions
diff --git a/base/common/src/com/netscape/cms/policy/APolicyRule.java b/base/common/src/com/netscape/cms/policy/APolicyRule.java index 0faf7591d..8ed943503 100644 --- a/base/common/src/com/netscape/cms/policy/APolicyRule.java +++ b/base/common/src/com/netscape/cms/policy/APolicyRule.java @@ -45,12 +45,12 @@ import com.netscape.certsrv.request.PolicyResult; * The abstract policy rule that concrete implementations will * extend. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -67,7 +67,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Initializes the policy rule. * <P> - * + * * @param config The config store reference */ public abstract void init(ISubsystem owner, IConfigStore config) @@ -76,7 +76,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Gets the description for this policy rule. * <P> - * + * * @return The Description for this rule. */ public String getDescription() { @@ -86,7 +86,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Sets a predicate expression for rule matching. * <P> - * + * * @param exp The predicate expression for the rule. */ public void setPredicate(IExpression exp) { @@ -96,7 +96,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Returns the predicate expression for the rule. * <P> - * + * * @return The predicate expression for the rule. */ public IExpression getPredicate() { @@ -106,7 +106,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Returns the name of the policy rule. * <P> - * + * * @return The name of the policy class. */ public String getName() { @@ -116,7 +116,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Sets the instance name for a policy rule. * <P> - * + * * @param instanceName The name of the rule instance. */ public void setInstanceName(String instanceName) { @@ -126,7 +126,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Returns the name of the policy rule instance. * <P> - * + * * @return The name of the policy rule instance if set, else * the name of the rule class. */ @@ -137,7 +137,7 @@ public abstract class APolicyRule implements IPolicyRule { /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -145,14 +145,14 @@ public abstract class APolicyRule implements IPolicyRule { /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public abstract Vector<String> getInstanceParams(); /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public abstract Vector<String> getDefaultParams(); @@ -263,7 +263,7 @@ public abstract class APolicyRule implements IPolicyRule { * Form a byte array of octet string key identifier from the sha-1 hash of * the Subject Public Key INFO. (including algorithm ID, etc.) * <p> - * + * * @param certInfo cert info of the certificate. * @return A Key identifier with the sha-1 hash of subject public key. */ @@ -314,7 +314,7 @@ public abstract class APolicyRule implements IPolicyRule { * Form a byte array of octet string key identifier from the sha-1 hash of * the Subject Public Key BIT STRING. * <p> - * + * * @param certInfo cert info of the certificate. * @return A Key identifier with the sha-1 hash of subject public key. */ diff --git a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java index b7a24bd65..f8cd03f75 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java +++ b/base/common/src/com/netscape/cms/policy/constraints/AgentPolicy.java @@ -36,12 +36,12 @@ import com.netscape.cms.policy.APolicyRule; * for agent approvals is done. If any are found, the request * is approved. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -55,13 +55,13 @@ public class AgentPolicy extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=AgentPolicy ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == netscape.com ra.Policy.rule.<ruleName>.class=xxxx * ra.Policy.rule.<ruleName>.params.* - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -105,7 +105,7 @@ public class AgentPolicy extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -141,7 +141,7 @@ public class AgentPolicy extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -150,7 +150,7 @@ public class AgentPolicy extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java index 93327445e..4ee689915 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java @@ -46,12 +46,12 @@ import com.netscape.cms.policy.APolicyRule; /** * This checks if attribute present. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java index 387b702bf..9b5fbd152 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; /** * DSAKeyConstraints policy enforces min and max size of the key. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -94,12 +94,12 @@ public class DSAKeyConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=DSAKeyConstraints * ra.Policy.rule.<ruleName>.enable=true ra.Policy.rule.<ruleName>.minSize=512 * ra.Policy.rule.<ruleName>.maxSize=1024 ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == * netscape.com - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -157,7 +157,7 @@ public class DSAKeyConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -226,7 +226,7 @@ public class DSAKeyConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -243,7 +243,7 @@ public class DSAKeyConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java b/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java index 2af145475..fecb59049 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java +++ b/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java @@ -34,12 +34,12 @@ import com.netscape.cms.policy.APolicyRule; * nothing. We can later add checks like whether or not to * revoke expired certs ..etc here. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -53,12 +53,12 @@ public class DefaultRevocation extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=DefaultRevocation ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == netscape.com - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -68,7 +68,7 @@ public class DefaultRevocation extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -78,7 +78,7 @@ public class DefaultRevocation extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -87,7 +87,7 @@ public class DefaultRevocation extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java index a08bde78c..43b7e1fd6 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java @@ -38,12 +38,12 @@ import com.netscape.cms.policy.APolicyRule; * IssuerConstraints is a rule for restricting the issuers of the * certificates used for certificate-based enrollments. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$ $Date$ */ @@ -81,7 +81,7 @@ public class IssuerConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -108,7 +108,7 @@ public class IssuerConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -190,7 +190,7 @@ public class IssuerConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -203,7 +203,7 @@ public class IssuerConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java index 3779b16e3..d656ed463 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java @@ -41,12 +41,12 @@ import com.netscape.cms.policy.APolicyRule; * honor only the keys generated using one of the permitted algorithms * such as RSA, DSA or DH. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -86,11 +86,11 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=KeyAlgorithmConstraints * ra.Policy.rule.<ruleName>.algorithms=RSA,DSA ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -151,7 +151,7 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -197,7 +197,7 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -216,7 +216,7 @@ public class KeyAlgorithmConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java b/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java index 3af9e636f..56b96f95f 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java +++ b/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java @@ -34,12 +34,12 @@ import com.netscape.cms.policy.APolicyRule; * is present. The policy rejects a request if any of the auth tokens * indicates authentication failure. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -53,12 +53,12 @@ public class ManualAuthentication extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ManualAuthentication ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate= ou == engineering AND o == netscape.com - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -68,7 +68,7 @@ public class ManualAuthentication extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -83,7 +83,7 @@ public class ManualAuthentication extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -92,7 +92,7 @@ public class ManualAuthentication extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java index 7c53808c5..a1f0805d0 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RSAKeyConstraints.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * RSAKeyConstraints policy enforces min and max size of the key. * Optionally checks the exponents. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -97,13 +97,13 @@ public class RSAKeyConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=RSAKeyConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.minSize=512 ra.Policy.rule.<ruleName>.maxSize=2048 * ra.Policy.rule.<ruleName>.predicate=ou==Marketing - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -158,7 +158,7 @@ public class RSAKeyConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -249,7 +249,7 @@ public class RSAKeyConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -271,7 +271,7 @@ public class RSAKeyConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java index f3e5efc9b..3ff977df5 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java @@ -38,15 +38,15 @@ import com.netscape.cms.policy.APolicyRule; /** * Whether to allow renewal of an expired cert. - * + * * @version $Revision$, $Date$ * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -93,12 +93,12 @@ public class RenewalConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.allowExpiredCerts=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -125,7 +125,7 @@ public class RenewalConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -218,7 +218,7 @@ public class RenewalConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -233,7 +233,7 @@ public class RenewalConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java index 0265ff855..2810fae10 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java @@ -42,19 +42,19 @@ import com.netscape.cmsutil.util.Utils; * currently active certificate can be renewed and sets new validity * period for the renewed certificate starting from the the ending * period in the old certificate. - * + * * The main parameters are: - * + * * The renewal leadtime in days: - i.e how many days before the * expiry of the current certificate can one request the renewal. * min and max validity duration. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -112,13 +112,13 @@ public class RenewalValidityConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.minValidity=30 ra.Policy.rule.<ruleName>.maxValidity=180 * ra.Policy.rule.<ruleName>.renewalInterval=15 ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -177,7 +177,7 @@ public class RenewalValidityConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -253,7 +253,7 @@ public class RenewalValidityConstraints extends APolicyRule Date renewedNotAfter = new Date(notAfter.getTime() + mMaxValidity); - // If the new notAfter is within renewal interval days from + // If the new notAfter is within renewal interval days from // today or already expired, set the notBefore to today. if (renewedNotAfter.before(now) || (renewedNotAfter.getTime() - now.getTime()) <= @@ -278,7 +278,7 @@ public class RenewalValidityConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -295,7 +295,7 @@ public class RenewalValidityConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java index 513e199c4..88c59b2fd 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java @@ -40,12 +40,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Whether to allow revocation of an expired cert. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -88,12 +88,12 @@ public class RevocationConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.allowExpiredCerts=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -115,7 +115,7 @@ public class RevocationConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -191,7 +191,7 @@ public class RevocationConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -206,7 +206,7 @@ public class RevocationConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java index 8b504eb50..90a8cc167 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * SigningAlgorithmConstraints enforces that only a supported * signing algorithm be requested. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -93,11 +93,11 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=SigningAlgorithmConstraints * ra.Policy.rule.<ruleName>.algorithms=SHA-1WithRSA, SHA-1WithDSA ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -183,7 +183,7 @@ public class SigningAlgorithmConstraints extends APolicyRule ((ICertAuthority) mAuthority).getCASigningAlgorithms(); if (allowedByKey != null) { - // don't show algorithms that don't match CA's key in UI. + // don't show algorithms that don't match CA's key in UI. mDefaultAllowedAlgs = new String[allowedByKey.length]; for (int i = 0; i < allowedByKey.length; i++) mDefaultAllowedAlgs[i] = allowedByKey[i]; @@ -200,7 +200,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Winnows out of mAllowedAlgorithms those algorithms that aren't allowed * for some reason. - * + * * @param allowed An array of allowed algorithms. Only algorithms in this * list will survive the winnowing process. * @param reason A string describing the problem with an algorithm @@ -247,7 +247,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -321,7 +321,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -340,7 +340,7 @@ public class SigningAlgorithmConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java index da63f6f24..07cc3b956 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * This simple policy checks the subordinate CA CSR to see * if it is the same as the local CA. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -77,11 +77,11 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form ra.Policy.rule.<ruleName>.implName=KeyAlgorithmConstraints * ra.Policy.rule.<ruleName>.algorithms=RSA,DSA ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -121,7 +121,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -154,7 +154,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli if (certSubjectName.equalsIgnoreCase(mIssuerNameStr)) { log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_SUBJECT_NAME_EXIST_1", mIssuerNameStr)); - setError(req, + setError(req, CMS.getUserMessage("CMS_POLICY_SUBJECT_NAME_EXIST", NAME + ":" + "Same As Issuer Name " + mIssuerNameStr), ""); result = PolicyResult.REJECTED; @@ -173,7 +173,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -184,7 +184,7 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java index 9afbf7650..27b5d1a92 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java +++ b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectName.java @@ -20,12 +20,12 @@ package com.netscape.cms.policy.constraints; /** * This class is used to help migrate CMS4.1 to CMS4.2. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java index 8c106800a..fb52b1302 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/UniqueSubjectNameConstraints.java @@ -47,22 +47,22 @@ import com.netscape.cms.policy.APolicyRule; * Checks the uniqueness of the subject name. This policy * can only be used (installed) in Certificate Authority * subsystem. - * + * * This policy can perform pre-agent-approval checking or * post-agent-approval checking based on configuration * setting. - * + * * In some situations, user may want to have 2 certificates with * the same subject name. For example, one key for encryption, * and one for signing. This policy does not deal with this case * directly. But it can be easily extended to do that. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -103,13 +103,13 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ca.Policy.rule.<ruleName>.implName=UniqueSubjectName ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.enable=true ca.Policy.rule.<ruleName>.enablePreAgentApprovalChecking=true * ca.Policy.rule.<ruleName>.enableKeyUsageExtensionChecking=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -146,7 +146,7 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -195,15 +195,15 @@ public class UniqueSubjectNameConstraints extends APolicyRule if (status.equals(ICertRecord.STATUS_REVOKED) || status.equals(ICertRecord.STATUS_EXPIRED) || status.equals(ICertRecord.STATUS_REVOKED_EXPIRED)) { - // accept this only if we have a REVOKED, + // accept this only if we have a REVOKED, // EXPIRED or REVOKED_EXPIRED certificate continue; } // you already have an VALID or INVALID (not yet valid) certificate if (mKeyUsageExtensionChecking && agentApproved(req)) { - // This request is agent approved which - // means all requested extensions are finalized + // This request is agent approved which + // means all requested extensions are finalized // to the request, // We will accept duplicated subject name with // different keyUsage extension if @@ -285,7 +285,7 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -300,7 +300,7 @@ public class UniqueSubjectNameConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java b/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java index 0409f3c33..72be9d75a 100644 --- a/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java +++ b/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java @@ -38,17 +38,17 @@ import com.netscape.cms.policy.APolicyRule; * ValidityConstraints is a default rule for Enrollment and * Renewal that enforces minimum and maximum validity periods * and changes them if not met. - * + * * Optionally the lead and lag times - i.e how far back into the * front or back the notBefore date could go in minutes can also * be specified. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -115,13 +115,13 @@ public class ValidityConstraints extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries probably are of the form: - * + * * ra.Policy.rule.<ruleName>.implName=ValidityConstraints ra.Policy.rule.<ruleName>.enable=true * ra.Policy.rule.<ruleName>.minValidity=30 ra.Policy.rule.<ruleName>.maxValidity=180 * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -171,7 +171,7 @@ public class ValidityConstraints extends APolicyRule /** * Applies the policy on the given Request. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -257,7 +257,7 @@ public class ValidityConstraints extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -278,7 +278,7 @@ public class ValidityConstraints extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { @@ -287,10 +287,10 @@ public class ValidityConstraints extends APolicyRule /** * Create a default validity value for a request - * + * * This code can be easily overridden in a derived class, if the * calculations here aren't accepatble. - * + * * TODO: it might be good to base this calculation on the creation * time of the request. */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java b/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java index fea126567..21e4ad920 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/AuthInfoAccessExt.java @@ -47,9 +47,9 @@ import com.netscape.cms.policy.APolicyRule; * Authority Information Access extension policy. * If this policy is enabled, it adds an authority * information access extension to the certificate. - * + * * The following listed sample configuration parameters: - * + * * ca.Policy.impl.AuthInfoAccess.class=com.netscape.certsrv.policy.AuthInfoAccessExt * ca.Policy.rule.aia.ad0_location=uriName:http://ocsp1.netscape.com * ca.Policy.rule.aia.ad0_method=ocsp @@ -66,16 +66,16 @@ import com.netscape.cms.policy.APolicyRule; * ca.Policy.rule.aia.enable=true * ca.Policy.rule.aia.implName=AuthInfoAccess * ca.Policy.rule.aia.predicate= - * + * * Currently, this policy only supports the following location: * uriName:[URI], dirName:[DN] * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -134,12 +134,12 @@ public class AuthInfoAccessExt extends APolicyRule implements /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=AuthInfoAccessExt ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.predicate= - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -214,7 +214,7 @@ public class AuthInfoAccessExt extends APolicyRule implements * If this policy is enabled, add the authority information * access extension to the certificate. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -305,7 +305,7 @@ public class AuthInfoAccessExt extends APolicyRule implements /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -367,7 +367,7 @@ public class AuthInfoAccessExt extends APolicyRule implements /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java b/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java index 971379a46..d7e058bf8 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/AuthorityKeyIdentifierExt.java @@ -48,12 +48,12 @@ import com.netscape.cms.policy.APolicyRule; * Authority Public Key Extension Policy * Adds the subject public key id extension to certificates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -76,7 +76,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule protected boolean mCritical = DEF_CRITICAL; protected String mAltKeyIdType = DEF_ALT_KEYID_TYPE; - // the extension to add to certs. + // the extension to add to certs. protected AuthorityKeyIdentifierExtension mTheExtension = null; // instance params for console @@ -105,13 +105,13 @@ public class AuthorityKeyIdentifierExt extends APolicyRule * (what communicator expects if the CA does not have a subject key * identifier extension) or (2) No extension set (3) Empty sequence * in Authority Key Identifier extension. - * + * * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate= ca.Policy.rule.<ruleName>.implName= ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -181,7 +181,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule } else { } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement(PROP_ALT_KEYID_TYPE + "=" + mAltKeyIdType); } @@ -190,7 +190,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule * Adds Authority Key Identifier Extension to a certificate. * If the extension is already there, accept it if it's from the agent, * else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -216,7 +216,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule public PolicyResult applyCert(IRequest req, X509CertInfo certInfo) { try { - // if authority key id extension already exists, leave it if + // if authority key id extension already exists, leave it if // from agent. else replace it. AuthorityKeyIdentifierExtension authorityKeyIdExt = null; CertificateExtensions extensions = (CertificateExtensions) @@ -228,7 +228,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule extensions.get(AuthorityKeyIdentifierExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (authorityKeyIdExt != null) { if (agentApproved(req)) { @@ -245,8 +245,8 @@ public class AuthorityKeyIdentifierExt extends APolicyRule } } - // if no authority key identifier should be set b/c CA does not - // have a subject key identifier, return here. + // if no authority key identifier should be set b/c CA does not + // have a subject key identifier, return here. if (mTheExtension == null) return PolicyResult.ACCEPTED; @@ -281,7 +281,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule * Form the Key Identifier in the Authority Key Identifier extension. * from the CA's cert. * <p> - * + * * @param caCertImpl Certificate Info * @return A Key Identifier. * @throws com.netscape.certsrv.base.EBaseException on error @@ -335,7 +335,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule /** * Get the Key Identifier in a subject key identifier extension from a * CertInfo. - * + * * @param certInfo the CertInfo structure. * @return Key Identifier in a Subject Key Identifier extension if any. */ @@ -375,7 +375,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule keyId = (KeyIdentifier) subjKeyIdExt.get( SubjectKeyIdentifierExtension.KEY_ID); } catch (IOException e) { - // no key identifier in subject key id extension. + // no key identifier in subject key id extension. String msg = NAME + ": " + "Bad Subject Key Identifier Extension found. Error: " + e; @@ -387,7 +387,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -396,7 +396,7 @@ public class AuthorityKeyIdentifierExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java index f830b7e3d..eeee26994 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java @@ -50,12 +50,12 @@ import com.netscape.cms.policy.APolicyRule; * Basic Constraints policy. * Adds the Basic constraints extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -95,10 +95,10 @@ public class BasicConstraintsExt extends APolicyRule * Initializes this policy rule. * <p> * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=BasicConstraintsExtImpl ca.Policy.rule.<ruleName>.pathLen=<n>, -1 for * undefined. ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -127,21 +127,21 @@ public class BasicConstraintsExt extends APolicyRule mCAPathLen = caCert.getBasicConstraints(); } - // set default to one less than the CA's pathlen or 0 if CA's - // pathlen is 0. + // set default to one less than the CA's pathlen or 0 if CA's + // pathlen is 0. // If it's unlimited default the max pathlen also to unlimited. if (mCAPathLen < 0) mDefaultMaxPathLen = -1; else if (mCAPathLen > 0) mDefaultMaxPathLen = mCAPathLen - 1; - else // (mCAPathLen == 0) + else // (mCAPathLen == 0) { log(ILogger.LL_WARN, CMS.getLogMessage("POLICY_PATHLEN_ZERO")); //return; } - // get configured max path len, use defaults if not configured. + // get configured max path len, use defaults if not configured. boolean pathLenConfigured = true; try { @@ -173,9 +173,9 @@ public class BasicConstraintsExt extends APolicyRule // check if configured path len is valid. if (pathLenConfigured) { - // if CA's pathlen is unlimited, any max pathlen is ok. - // else maxPathlen must be at most one less than the CA's - // pathlen or 0 if CA's pathlen is 0. + // if CA's pathlen is unlimited, any max pathlen is ok. + // else maxPathlen must be at most one less than the CA's + // pathlen or 0 if CA's pathlen is 0. if (mCAPathLen > 0 && (mMaxPathLen >= mCAPathLen || mMaxPathLen < 0)) { @@ -205,7 +205,7 @@ public class BasicConstraintsExt extends APolicyRule * Checks if the basic contraints extension in certInfo is valid and * add the basic constraints extension for CA certs if none exists. * Non-CA certs do not get a basic constraints extension. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -263,7 +263,7 @@ public class BasicConstraintsExt extends APolicyRule // no extensions or basic constraints extension. } - // for non-CA certs, pkix says it SHOULD NOT have the extension + // for non-CA certs, pkix says it SHOULD NOT have the extension // so remove it. if (!isCA) { if (extensions == null) { @@ -275,7 +275,7 @@ public class BasicConstraintsExt extends APolicyRule certInfo.set(X509CertInfo.EXTENSIONS, extensions); } catch (CertificateException e) { } catch (IOException e) { - // not possible + // not possible } } if (basicExt != null) { @@ -309,11 +309,11 @@ public class BasicConstraintsExt extends APolicyRule } // For CA certs, check if existing extension is valid, and adjust. - // Extension must be marked critial and pathlen must be < CA's pathlen. + // Extension must be marked critial and pathlen must be < CA's pathlen. // if CA's pathlen is 0 all ca certs are rejected. if (mCAPathLen == 0) { - // reject all subordinate CA cert requests because CA's + // reject all subordinate CA cert requests because CA's // path length is 0. log(ILogger.LL_FAILURE, CMS.getLogMessage("POLICY_NO_SUB_CA_CERTS_ALLOWED_1", NAME)); @@ -399,7 +399,7 @@ public class BasicConstraintsExt extends APolicyRule } catch (CertificateException e) { // not possible } catch (IOException e) { - // not possible + // not possible } } @@ -460,7 +460,7 @@ public class BasicConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -476,7 +476,7 @@ public class BasicConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java b/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java index 1ede3d5d0..7cf50385e 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CRLDistributionPointsExt.java @@ -55,12 +55,12 @@ import com.netscape.cms.policy.APolicyRule; * to tell whether the simple string should be stored in an X.500 Name, * a URL, or an RDN. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -475,7 +475,7 @@ public class CRLDistributionPointsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java index 597357318..4124d430d 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java @@ -53,12 +53,12 @@ import com.netscape.cms.policy.APolicyRule; * Certificate Policies. * Adds certificate policies extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -90,12 +90,12 @@ public class CertificatePoliciesExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -115,7 +115,7 @@ public class CertificatePoliciesExt extends APolicyRule "value must be greater than or equal to 1")); } - // init Policy Mappings, check values if enabled. + // init Policy Mappings, check values if enabled. mCertPolicies = new CertPolicy[mNumCertPolicies]; for (int i = 0; i < mNumCertPolicies; i++) { String subtreeName = PROP_CERTPOLICY + i; @@ -147,7 +147,7 @@ public class CertificatePoliciesExt extends APolicyRule } } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_NUM_CERTPOLICIES + "=" + mNumCertPolicies); @@ -159,7 +159,7 @@ public class CertificatePoliciesExt extends APolicyRule /** * Applies the policy on the given Request. * <p> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -203,7 +203,7 @@ public class CertificatePoliciesExt extends APolicyRule extensions.delete(CertificatePoliciesExtension.NAME); } catch (IOException e) { // this is the hack: for some reason, the key which is the name - // of the policy has been converted into the OID + // of the policy has been converted into the OID try { extensions.delete("2.5.29.32"); } catch (IOException ee) { @@ -236,7 +236,7 @@ public class CertificatePoliciesExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -271,7 +271,7 @@ public class CertificatePoliciesExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { @@ -335,7 +335,7 @@ class CertPolicy { /** * forms policy map parameters. - * + * * @param name name of this policy map, for example certPolicy0 * @param config parent's config from where we find this configuration. * @param enabled whether policy was enabled. diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java index 28366ade8..58ce112f3 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CertificateRenewalWindowExt.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Certificate Renewal Window Extension Policy * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -74,7 +74,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Initializes this policy rule. - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -88,7 +88,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Applies the policy on the given Request. * <p> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -139,7 +139,7 @@ public class CertificateRenewalWindowExt extends APolicyRule } catch (IOException e) { // this is the hack: for some reason, the key which is the name - // of the policy has been converted into the OID + // of the policy has been converted into the OID try { extensions.delete("2.16.840.1.113730.1.15"); } catch (IOException ee) { @@ -218,7 +218,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -240,7 +240,7 @@ public class CertificateRenewalWindowExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java b/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java index b385923af..779be165b 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/CertificateScopeOfUseExt.java @@ -46,12 +46,12 @@ import com.netscape.cms.policy.APolicyRule; * Certificate Scope Of Use extension policy. This extension * is defined in draft-thayes-cert-scope-00.txt * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -100,12 +100,12 @@ public class CertificateScopeOfUseExt extends APolicyRule implements /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=AuthInfoAccessExt ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.predicate= - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -157,7 +157,7 @@ public class CertificateScopeOfUseExt extends APolicyRule implements * If this policy is enabled, add the authority information * access extension to the certificate. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -244,7 +244,7 @@ public class CertificateScopeOfUseExt extends APolicyRule implements /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -300,7 +300,7 @@ public class CertificateScopeOfUseExt extends APolicyRule implements /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java index 65ef6b937..93267bd1e 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/ExtendedKeyUsageExt.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; /** * This implements the extended key usage extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java index 0202ee784..eb8ab2285 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java +++ b/base/common/src/com/netscape/cms/policy/extensions/GenericASN1Ext.java @@ -49,9 +49,9 @@ import com.netscape.cms.policy.APolicyRule; * Private Integer extension policy. * If this policy is enabled, it adds an Private Integer * extension to the certificate. - * + * * The following listed sample configuration parameters: - * + * * ca.Policy.impl.privateInteger.class=com.netscape.certsrv.policy.genericASNExt * ca.Policy.rule.genericASNExt.enable=true * ca.Policy.rule.genericASNExt.name=myIntegerExtension @@ -76,12 +76,12 @@ import com.netscape.cms.policy.APolicyRule; * ca.Policy.rule.genericASNExt.implName=genericASNExt * ca.Policy.rule.genericASNExt.predicate= * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -210,12 +210,12 @@ public class GenericASN1Ext extends APolicyRule implements /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=genericASNExt ca.Policy.rule.<ruleName>.enable=true * ca.Policy.rule.<ruleName>.predicate= - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -256,7 +256,7 @@ public class GenericASN1Ext extends APolicyRule implements log(ILogger.LL_FAILURE, "" + e.toString()); } - // Check OID value + // Check OID value CMS.checkOID(name, oid); pattern = mConfig.getString(PROP_PATTERN, null); checkOID(0); @@ -341,7 +341,7 @@ public class GenericASN1Ext extends APolicyRule implements * If this policy is enabled, add the private Integer * information extension to the certificate. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -453,7 +453,7 @@ public class GenericASN1Ext extends APolicyRule implements /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -485,7 +485,7 @@ public class GenericASN1Ext extends APolicyRule implements /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java index bb9abd9cf..9ceaf99bd 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/IssuerAltNameExt.java @@ -42,16 +42,16 @@ import com.netscape.cms.policy.APolicyRule; /** * Issuer Alt Name Extension policy. - * + * * This extension is used to associate Internet-style identities * with the Certificate issuer. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -101,7 +101,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Initializes this policy rule. - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -139,7 +139,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Adds a extension if none exists. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -224,7 +224,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return Empty Vector since this policy has no configuration parameters. * for this policy instance. */ @@ -234,7 +234,7 @@ public class IssuerAltNameExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return Empty Vector since this policy implementation has no * configuration parameters. */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java index 6594cc4a2..24e5f45ed 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Policy to add Key Usage Extension. * Adds the key usage extension based on what's requested. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -96,11 +96,11 @@ public class KeyUsageExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=KeyUsageExt ca.Policy.rule.<ruleName>.enable=true ca.Policy.rule.<ruleName>. - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -120,9 +120,9 @@ public class KeyUsageExt extends APolicyRule CertificateChain caChain = certAuthority.getCACertChain(); X509Certificate caCert = null; - // Note that in RA the chain could be null if CA was not up when - // RA was started. In that case just set the length to -1 and let - // CA reject if it does not allow any subordinate CA certs. + // Note that in RA the chain could be null if CA was not up when + // RA was started. In that case just set the length to -1 and let + // CA reject if it does not allow any subordinate CA certs. if (caChain != null) { caCert = caChain.getFirstCertificate(); mCAPathLen = caCert.getBasicConstraints(); @@ -147,14 +147,14 @@ public class KeyUsageExt extends APolicyRule * or RA could have set the extension.) * If not set, set from http input parameters or use default if * no http input parameters are set. - * + * * Note: this allows any bits requested - does not check if user * authenticated is allowed to have a Key Usage Extension with * those bits. Unless the CA's certificate path length is 0, then * we do not allow CA sign or CRL sign bits in any request. - * + * * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -191,7 +191,7 @@ public class KeyUsageExt extends APolicyRule // extension isn't there. ext = null; } - // check if CA does not allow subordinate CA certs. + // check if CA does not allow subordinate CA certs. // otherwise accept existing key usage extension. if (ext != null) { if (mCAPathLen == 0) { @@ -239,7 +239,7 @@ public class KeyUsageExt extends APolicyRule bits[KeyUsageExtension.DECIPHER_ONLY_BIT] = getBit("decipher_only", mDecipherOnly, req); - // don't allow no bits set or the extension does not + // don't allow no bits set or the extension does not // encode/decode properlly. boolean bitset = false; @@ -278,7 +278,7 @@ public class KeyUsageExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -344,7 +344,7 @@ public class KeyUsageExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java b/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java index ecc084d29..ca18b8023 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/NSCCommentExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Netscape comment * Adds Netscape comment policy * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -89,10 +89,10 @@ public class NSCCommentExt extends APolicyRule * Initializes this policy rule. * <p> * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.implName=NSCCommentExtImpl ca.Policy.rule.<ruleName>.displayText=<n> * ca.Policy.rule.<ruleName>.commentFile=<n> ca.Policy.rule.<ruleName>.enable=false - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -147,7 +147,7 @@ public class NSCCommentExt extends APolicyRule /** * Applies the policy on the given Request. * <p> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -199,7 +199,7 @@ public class NSCCommentExt extends APolicyRule } catch (IOException e) { // this is the hack: for some reason, the key which is the name - // of the policy has been converted into the OID + // of the policy has been converted into the OID try { extensions.delete("2.16.840.1.113730.1.13"); } catch (IOException ee) { @@ -269,7 +269,7 @@ public class NSCCommentExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -278,7 +278,7 @@ public class NSCCommentExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java index 2fb09b2b7..c5daabed9 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java @@ -49,12 +49,12 @@ import com.netscape.cms.policy.APolicyRule; * NS Cert Type policy. * Adds the ns cert type extension depending on cert type requested. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -70,20 +70,20 @@ public class NSCertTypeExt extends APolicyRule protected static final boolean[] DEF_BITS = new boolean[NSCertTypeExtension.NBITS]; - // XXX for future use. currenlty always allow. + // XXX for future use. currenlty always allow. protected static final String PROP_AGENT_OVERR = "allowAgentOverride"; protected static final String PROP_EE_OVERR = "AllowEEOverride"; - // XXX for future use. currently always critical - // (standard says SHOULD be marked critical if included.) + // XXX for future use. currently always critical + // (standard says SHOULD be marked critical if included.) protected static final String PROP_CRITICAL = "critical"; - // XXX for future use to allow overrides from forms. + // XXX for future use to allow overrides from forms. // request must be agent approved or authenticated. protected boolean mAllowAgentOverride = false; protected boolean mAllowEEOverride = false; - // XXX for future use. currently always non-critical + // XXX for future use. currently always non-critical protected boolean mCritical = false; protected int mCAPathLen = -1; @@ -111,11 +111,11 @@ public class NSCertTypeExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=nsCertTypeExt ra.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -153,7 +153,7 @@ public class NSCertTypeExt extends APolicyRule * reads ns cert type choices from form. If no choices from form * will defaults to all. * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -224,7 +224,7 @@ public class NSCertTypeExt extends APolicyRule bits = getBitsFromRequest(req, mSetDefaultBits); - // check if ca doesn't allow any subordinate ca + // check if ca doesn't allow any subordinate ca if (mCAPathLen == 0 && bits != null) { if (bits[NSCertTypeExtension.SSL_CA_BIT] || bits[NSCertTypeExtension.EMAIL_CA_BIT] || @@ -283,7 +283,7 @@ public class NSCertTypeExt extends APolicyRule // always return false for now to make sure minimum is set. // agents and ee can add others. - // must be agent approved or authenticated for allowing extensions + // must be agent approved or authenticated for allowing extensions // which is always the case if we get to this point. IAuthToken token = req.getExtDataInAuthToken(IRequest.AUTH_TOKEN); @@ -448,7 +448,7 @@ public class NSCertTypeExt extends APolicyRule if (certType.equals(IRequest.CLIENT_CERT)) { CMS.debug("NSCertTypeExt: setting bits for client cert"); - // we can only guess here when it's client. + // we can only guess here when it's client. // sets all client bit for default. bits[NSCertTypeExtension.SSL_CLIENT_BIT] = true; bits[NSCertTypeExtension.EMAIL_BIT] = true; @@ -488,7 +488,7 @@ public class NSCertTypeExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -526,7 +526,7 @@ public class NSCertTypeExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java index f010bf3f1..1b132e835 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/NameConstraintsExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Adds the name constraints extension to a (CA) certificate. * Filtering of CA certificates is done through predicates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -89,21 +89,21 @@ public class NameConstraintsExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException { mConfig = config; - // XXX should do do this ? - // if CA does not allow subordinate CAs by way of basic constraints, - // this policy always rejects + // XXX should do do this ? + // if CA does not allow subordinate CAs by way of basic constraints, + // this policy always rejects /***** * ICertAuthority certAuthority = (ICertAuthority) * ((IPolicyProcessor)owner).getAuthority(); @@ -192,7 +192,7 @@ public class NameConstraintsExt extends APolicyRule } } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_NUM_PERMITTEDSUBTREES + "=" + mNumPermittedSubtrees); @@ -225,15 +225,15 @@ public class NameConstraintsExt extends APolicyRule /** * Adds Name Constraints Extension to a (CA) certificate. - * + * * If a Name constraints Extension is already there, accept it if * it's been approved by agent, else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ public PolicyResult apply(IRequest req) { - // if extension hasn't been properly configured reject requests until + // if extension hasn't been properly configured reject requests until // it has been resolved (or disabled). if (mNameConstraintsExtension == null) { //setError(req, PolicyResources.EXTENSION_NOT_INITED_1, NAME); @@ -275,7 +275,7 @@ public class NameConstraintsExt extends APolicyRule extensions.get(NameConstraintsExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (nameConstraintsExt != null) { @@ -320,7 +320,7 @@ public class NameConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -350,7 +350,7 @@ public class NameConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java b/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java index 33f2f85e0..aece9664a 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/OCSPNoCheckExt.java @@ -42,12 +42,12 @@ import com.netscape.cms.policy.APolicyRule; * This implements an OCSP Signing policy, it * adds the OCSP Signing extension to the certificate. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$ $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java index 861107b8e..0bb77e207 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PolicyConstraintsExt.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; * Adds the policy constraints extension to (CA) certificates. * Filtering of CA certificates is done through predicates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -90,21 +90,21 @@ public class PolicyConstraintsExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException { mConfig = config; - // XXX should do do this ? - // if CA does not allow subordinate CAs by way of basic constraints, - // this policy always rejects + // XXX should do do this ? + // if CA does not allow subordinate CAs by way of basic constraints, + // this policy always rejects /***** * ICertAuthority certAuthority = (ICertAuthority) * ((GenericPolicyProcessor)owner).mAuthority; @@ -136,7 +136,7 @@ public class PolicyConstraintsExt extends APolicyRule if (mInhibitPolicyMapping < -1) mInhibitPolicyMapping = -1; - // create instance of policy constraings extension + // create instance of policy constraings extension try { mPolicyConstraintsExtension = new PolicyConstraintsExtension(mCritical, @@ -152,7 +152,7 @@ public class PolicyConstraintsExt extends APolicyRule "Could not init Policy Constraints Extension. Error: " + e)); } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_REQ_EXPLICIT_POLICY + "=" + mReqExplicitPolicy); @@ -162,15 +162,15 @@ public class PolicyConstraintsExt extends APolicyRule /** * Adds Policy Constraints Extension to a (CA) certificate. - * + * * If a Policy constraints Extension is already there, accept it if * it's been approved by agent, else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ public PolicyResult apply(IRequest req) { - // if extension hasn't been properly configured reject requests until + // if extension hasn't been properly configured reject requests until // it has been resolved (or disabled). if (mPolicyConstraintsExtension == null) { return PolicyResult.ACCEPTED; @@ -210,7 +210,7 @@ public class PolicyConstraintsExt extends APolicyRule extensions.get(PolicyConstraintsExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (policyConstraintsExt != null) { @@ -247,7 +247,7 @@ public class PolicyConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -256,7 +256,7 @@ public class PolicyConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java b/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java index 7623f455f..0af8b86ca 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PolicyMappingsExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; * Adds the Policy Mappings extension to a (CA) certificate. * Filtering of CA certificates is done through predicates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -84,21 +84,21 @@ public class PolicyMappingsExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate=certType==ca ca.Policy.rule.<ruleName>.implName= * ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) throws EBaseException { mConfig = config; - // XXX should do do this ? - // if CA does not allow subordinate CAs by way of basic constraints, - // this policy always rejects + // XXX should do do this ? + // if CA does not allow subordinate CAs by way of basic constraints, + // this policy always rejects /***** * ICertAuthority certAuthority = (ICertAuthority) * ((IPolicyProcessor)owner).getAuthority(); @@ -129,7 +129,7 @@ public class PolicyMappingsExt extends APolicyRule "value must be greater than or equal to 1")); } - // init Policy Mappings, check values if enabled. + // init Policy Mappings, check values if enabled. mPolicyMaps = new PolicyMap[mNumPolicyMappings]; for (int i = 0; i < mNumPolicyMappings; i++) { String subtreeName = PROP_POLICYMAP + i; @@ -161,7 +161,7 @@ public class PolicyMappingsExt extends APolicyRule } } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement( PROP_NUM_POLICYMAPPINGS + "=" + mNumPolicyMappings); @@ -172,15 +172,15 @@ public class PolicyMappingsExt extends APolicyRule /** * Adds policy mappings Extension to a (CA) certificate. - * + * * If a policy mappings Extension is already there, accept it if * it's been approved by agent, else replace it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ public PolicyResult apply(IRequest req) { - // if extension hasn't been properly configured reject requests until + // if extension hasn't been properly configured reject requests until // it has been resolved (or disabled). if (mPolicyMappingsExtension == null) { //setError(req, PolicyResources.EXTENSION_NOT_INITED_1, NAME); @@ -221,7 +221,7 @@ public class PolicyMappingsExt extends APolicyRule extensions.get(PolicyMappingsExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (policyMappingsExt != null) { @@ -258,7 +258,7 @@ public class PolicyMappingsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -286,7 +286,7 @@ public class PolicyMappingsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { @@ -338,7 +338,7 @@ class PolicyMap { /** * forms policy map parameters. - * + * * @param name name of this policy map, for example policyMap0 * @param config parent's config from where we find this configuration. * @param enabled whether policy was enabled. diff --git a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java index e13a7a84c..b586c8bdf 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PresenceExt.java @@ -31,12 +31,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Checks extension presence. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -148,7 +148,7 @@ public class PresenceExt extends APolicyRule { /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java index 3b80246a9..fd52e9bb1 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java @@ -44,12 +44,12 @@ import com.netscape.cms.policy.APolicyRule; /** * PrivateKeyUsagePeriod Identifier Extension policy. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -124,7 +124,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule * ra.Policy.rule.<ruleName>.notAfter=180 * ra.Policy.rule.<ruleName>.critical=false * ra.Policy.rule.<ruleName>.predicate=ou==Sales - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -151,7 +151,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule /** * Adds a private key usage extension if none exists. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -222,7 +222,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return Empty Vector since this policy has no configuration parameters. * for this policy instance. */ @@ -237,7 +237,7 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return Empty Vector since this policy implementation has no * configuration parameters. */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java index 2a5af4240..b5d6d8eec 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java @@ -40,12 +40,12 @@ import com.netscape.cms.policy.APolicyRule; * Remove Basic Constraints policy. * Adds the Basic constraints extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -109,7 +109,7 @@ public class RemoveBasicConstraintsExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -120,7 +120,7 @@ public class RemoveBasicConstraintsExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java index 63bd8804c..e1ae7d074 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjAltNameExt.java @@ -42,50 +42,50 @@ import com.netscape.certsrv.request.PolicyResult; import com.netscape.cms.policy.APolicyRule; /** - * + * * THIS POLICY HAS BEEN DEPRECATED SINCE CMS 4.2. * New Policy is com.netscape.certsrv.policy.SubjectAltNameExt. * <p> - * + * * Subject Alternative Name extension policy in CMS 4.1. - * + * * Adds the subject alternative name extension depending on the certificate type requested. - * + * * Two forms are supported. 1) For S/MIME certificates, email addresses are copied from data stored in the request by * the authentication component. Both 'e' and 'altEmail' are supported so that both the primary address and alternative * forms may be certified. Only the primary goes in the subjectName position (which should be phased out). - * + * * e mailAlternateAddress * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ public class SubjAltNameExt extends APolicyRule implements IEnrollmentPolicy, IExtendedPluginInfo { - // for future use. currently always allow. + // for future use. currently always allow. protected static final String PROP_AGENT_OVERR = "allowAgentOverride"; protected static final String PROP_EE_OVERR = "AllowEEOverride"; protected static final String PROP_ENABLE_MANUAL_VALUES = "enableManualValues"; - // for future use. currently always non-critical - // (standard says SHOULD be marked critical if included.) + // for future use. currently always non-critical + // (standard says SHOULD be marked critical if included.) protected static final String PROP_CRITICAL = "critical"; - // for future use to allow overrides from forms. + // for future use to allow overrides from forms. // request must be agent approved or authenticated. protected boolean mAllowAgentOverride = false; protected boolean mAllowEEOverride = false; protected boolean mEnableManualValues = false; - // for future use. currently always critical - // (standard says SHOULD be marked critical if included.) + // for future use. currently always critical + // (standard says SHOULD be marked critical if included.) protected boolean mCritical = false; public SubjAltNameExt() { @@ -116,11 +116,11 @@ public class SubjAltNameExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=SubjAltNameExt ra.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -134,9 +134,9 @@ public class SubjAltNameExt extends APolicyRule /** * Adds the subject alternative names extension if not set already. - * + * * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -303,7 +303,7 @@ public class SubjAltNameExt extends APolicyRule /** * Create a new SET of extensions in the certificate info * object. - * + * * This should be a method in the X509CertInfo object */ protected CertificateExtensions @@ -323,7 +323,7 @@ public class SubjAltNameExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -339,7 +339,7 @@ public class SubjAltNameExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java index 62f0b21da..0d89d8876 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectAltNameExt.java @@ -46,31 +46,31 @@ import com.netscape.cms.policy.APolicyRule; /** * Subject Alternative Name extension policy. - * + * * Adds the subject alternative name extension as configured. - * + * * Two forms are supported. 1) For S/MIME certificates, email * addresses are copied from data stored in the request by the * authentication component. Both 'e' and 'altEmail' are supported * so that both the primary address and alternative forms may be * certified. Only the primary goes in the subjectName position (which * should be phased out). - * + * * e * mailAlternateAddress * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ public class SubjectAltNameExt extends APolicyRule implements IEnrollmentPolicy, IExtendedPluginInfo { - // (standard says SHOULD be marked critical if included.) + // (standard says SHOULD be marked critical if included.) protected static final String PROP_CRITICAL = "critical"; protected static final boolean DEF_CRITICAL = false; @@ -106,11 +106,11 @@ public class SubjectAltNameExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ra.Policy.rule.<ruleName>.implName=SubjectAltNameExt ra.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -150,9 +150,9 @@ public class SubjectAltNameExt extends APolicyRule /** * Adds the subject alternative names extension if not set already. - * + * * <P> - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -187,7 +187,7 @@ public class SubjectAltNameExt extends APolicyRule certInfo.get(X509CertInfo.EXTENSIONS); // Remove any previously computed version of the extension - // unless it is from RA. If from RA, accept what RA put in + // unless it is from RA. If from RA, accept what RA put in // request and don't add our own. if (extensions != null) { String sourceId = req.getSourceId(); @@ -232,7 +232,7 @@ public class SubjectAltNameExt extends APolicyRule curCritical = true; } - // make the extension + // make the extension SubjectAlternativeNameExtension sa = new SubjectAlternativeNameExtension(curCritical, gns); // add it to certInfo. @@ -265,7 +265,7 @@ public class SubjectAltNameExt extends APolicyRule /** * Create a new SET of extensions in the certificate info * object. - * + * * This should be a method in the X509CertInfo object */ protected CertificateExtensions @@ -285,7 +285,7 @@ public class SubjectAltNameExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -294,7 +294,7 @@ public class SubjectAltNameExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java index 6b4e7ead9..bcd9c9885 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java @@ -47,12 +47,12 @@ import com.netscape.cms.policy.APolicyRule; /** * Policy to add the subject directory attributes extension. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ diff --git a/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java b/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java index 32d254c40..16fc73347 100644 --- a/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java +++ b/base/common/src/com/netscape/cms/policy/extensions/SubjectKeyIdentifierExt.java @@ -49,12 +49,12 @@ import com.netscape.cms.policy.APolicyRule; * Subject Public Key Extension Policy * Adds the subject public key id extension to certificates. * <P> - * + * * <PRE> * NOTE: The Policy Framework has been replaced by the Profile Framework. * </PRE> * <P> - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -101,11 +101,11 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Initializes this policy rule. * <P> - * + * * The entries may be of the form: - * + * * ca.Policy.rule.<ruleName>.predicate= ca.Policy.rule.<ruleName>.implName= ca.Policy.rule.<ruleName>.enable=true - * + * * @param config The config store reference */ public void init(ISubsystem owner, IConfigStore config) @@ -145,7 +145,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule KEYID_TYPE_SPKISHA1)); } - // form instance params + // form instance params mInstanceParams.addElement(PROP_CRITICAL + "=" + mCritical); mInstanceParams.addElement(PROP_KEYID_TYPE + "=" + mKeyIdType); @@ -157,7 +157,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Adds Subject Key identifier Extension to a certificate. * If the extension is already there, accept it. - * + * * @param req The request on which to apply policy. * @return The policy result object. */ @@ -194,7 +194,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule extensions.get(SubjectKeyIdentifierExtension.NAME); } } catch (IOException e) { - // extension isn't there. + // extension isn't there. } if (subjectKeyIdExt != null) { if (agentApproved(req)) { @@ -253,7 +253,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Form the Key Identifier in the Subject Key Identifier extension. * <p> - * + * * @param certInfo Certificate Info * @param req request * @return A Key Identifier. @@ -284,7 +284,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule * the least significate 60 bits of the sha-1 hash of the subject * public key BIT STRING in accordance with RFC 2459. * <p> - * + * * @param certInfo - certificate info * @return A Key Identifier with value formulatd as described. */ @@ -339,7 +339,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Return configured parameters for a policy rule instance. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getInstanceParams() { @@ -348,7 +348,7 @@ public class SubjectKeyIdentifierExt extends APolicyRule /** * Return default parameters for a policy implementation. - * + * * @return nvPairs A Vector of name/value pairs. */ public Vector<String> getDefaultParams() { |