diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/profile/constraint')
15 files changed, 36 insertions, 36 deletions
diff --git a/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java index f924c587f..ca2668f7d 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/BasicConstraintsExtConstraint.java @@ -42,7 +42,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the basic constraints extension constraint. * It checks if the basic constraint in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class BasicConstraintsExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java index e118fa215..a7a159de3 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/CAValidityConstraint.java @@ -41,7 +41,7 @@ import com.netscape.cms.profile.def.ValidityDefault; * This class implements the validity constraint. * It checks if the validity in the certificate * template is within the CA's validity. - * + * * @version $Revision$, $Date$ */ public class CAValidityConstraint extends CAEnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java index 40c2153a8..eb3eb14f6 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/EnrollConstraint.java @@ -40,7 +40,7 @@ import com.netscape.cms.profile.common.EnrollProfile; /** * This class implements the generic enrollment constraint. - * + * * @version $Revision$, $Date$ */ public abstract class EnrollConstraint implements IPolicyConstraint { @@ -114,7 +114,7 @@ public abstract class EnrollConstraint implements IPolicyConstraint { /** * Validates the request. The request is not modified * during the validation. - * + * * @param request enrollment request * @param info certificate template * @exception ERejectException request is rejected due @@ -126,11 +126,11 @@ public abstract class EnrollConstraint implements IPolicyConstraint { /** * Validates the request. The request is not modified * during the validation. - * + * * The current implementation of this method calls * into the subclass's validate(request, info) * method for validation checking. - * + * * @param request request * @exception ERejectException request is rejected due * to violation of constraint diff --git a/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java index 3c737e8a5..7821964b9 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/ExtendedKeyUsageExtConstraint.java @@ -43,7 +43,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the extended key usage extension constraint. * It checks if the extended key usage extension in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class ExtendedKeyUsageExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java index 1562fddb8..97dc358e3 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/ExtensionConstraint.java @@ -40,7 +40,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the general extension constraint. * It checks if the extension in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class ExtensionConstraint extends EnrollConstraint { @@ -110,7 +110,7 @@ public class ExtensionConstraint extends EnrollConstraint { getConfig(CONFIG_OID))); } - // check criticality + // check criticality String value = getConfig(CONFIG_CRITICAL); if (!isOptional(value)) { diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java index e6f5019a0..2d1f44751 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/KeyConstraint.java @@ -46,7 +46,7 @@ import com.netscape.cms.profile.def.UserKeyDefault; /** * This constraint is to check the key type and * key length. - * + * * @version $Revision$, $Date$ */ @SuppressWarnings("serial") @@ -454,7 +454,7 @@ public class KeyConstraint extends EnrollConstraint { CMS.debug("algId: " + algid); - //Get raw string representation of alg parameters, will give + //Get raw string representation of alg parameters, will give //us the curve OID. String params = null; @@ -582,7 +582,7 @@ public class KeyConstraint extends EnrollConstraint { if (keyType.equals("")) return; } - // All the params we need for validation have been collected, + // All the params we need for validation have been collected, // we don't know which order they will show up if (keyType.length() > 0 && keyParams.length() > 0) { String[] params = keyParams.split(","); diff --git a/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java index 927c64ec2..f7ec42215 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/KeyUsageExtConstraint.java @@ -40,7 +40,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the key usage extension constraint. * It checks if the key usage constraint in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class KeyUsageExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java index 843360542..066553275 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/NSCertTypeExtConstraint.java @@ -39,7 +39,7 @@ import com.netscape.cms.profile.def.UserExtensionDefault; * This class implements the Netscape certificate type extension constraint. * It checks if the Netscape certificate type extension in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class NSCertTypeExtConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java index 459e9f219..17f6e0b37 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/NoConstraint.java @@ -35,7 +35,7 @@ import com.netscape.certsrv.request.IRequest; /** * This class implements no constraint. - * + * * @version $Revision$, $Date$ */ public class NoConstraint implements IPolicyConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java index fb01d7d14..d1403962e 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java @@ -38,13 +38,13 @@ import com.netscape.cms.profile.def.NoDefault; /** * This class supports renewal grace period, which has two * parameters: graceBefore and graceAfter - * + * * @author Christina Fu * @version $Revision$, $Date$ */ public class RenewGracePeriodConstraint extends EnrollConstraint { - // for renewal: # of days before the orig cert expiration date + // for renewal: # of days before the orig cert expiration date public static final String CONFIG_RENEW_GRACE_BEFORE = "renewal.graceBefore"; // for renewal: # of days after the orig cert expiration date public static final String CONFIG_RENEW_GRACE_AFTER = "renewal.graceAfter"; diff --git a/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java index 4dbe329b3..4ccb9ad8f 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/SigningAlgConstraint.java @@ -43,7 +43,7 @@ import com.netscape.cms.profile.def.UserSigningAlgDefault; * This class implements the signing algorithm constraint. * It checks if the signing algorithm in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class SigningAlgConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java index 477e99b98..6ecac885b 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/SubjectNameConstraint.java @@ -41,7 +41,7 @@ import com.netscape.cms.profile.def.UserSubjectNameDefault; * This class implements the subject name constraint. * It checks if the subject name in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class SubjectNameConstraint extends EnrollConstraint { diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java index f10130aa6..8d7a67a77 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/UniqueKeyConstraint.java @@ -46,13 +46,13 @@ import com.netscape.cms.profile.def.NoDefault; * The config param "allowSameKeyRenewal" enables the * situation where if the publickey is not unique, and if * the subject DN is the same, that is a "renewal". - * + * * Another "feature" that is quoted out of this code is the * "revokeDupKeyCert" option, which enables the revocation * of certs that bear the same publickey as the enrolling * request. Since this can potentially be abused, it is taken * out and preserved in comments to allow future refinement. - * + * * @version $Revision$, $Date$ */ public class UniqueKeyConstraint extends EnrollConstraint { @@ -166,7 +166,7 @@ public class UniqueKeyConstraint extends EnrollConstraint { BigInteger serialNum = cert.getSerialNumber(); ICAService service = (ICAService) mCA.getCAService(); - RevokedCertImpl crlEntry = + RevokedCertImpl crlEntry = formCRLEntry(serialNum, RevocationReason.KEY_COMPROMISE); service.revokeCert(crlEntry); CMS.debug("UniqueKeyConstraint: certificate with duplicate publickey revoked successfully"); @@ -234,28 +234,28 @@ public class UniqueKeyConstraint extends EnrollConstraint { /** * make a CRL entry from a serial number and revocation reason. - * + * * @return a RevokedCertImpl that can be entered in a CRL. - * + * * protected RevokedCertImpl formCRLEntry( * BigInteger serialNo, RevocationReason reason) * throws EBaseException { * CRLReasonExtension reasonExt = new CRLReasonExtension(reason); * CRLExtensions crlentryexts = new CRLExtensions(); - * + * * try { * crlentryexts.set(CRLReasonExtension.NAME, reasonExt); * } catch (IOException e) { * CMS.debug("CMSGW_ERR_CRL_REASON "+e.toString()); - * + * * // throw new ECMSGWException( * // CMS.getLogMessage("CMSGW_ERROR_SETTING_CRLREASON")); - * + * * } * RevokedCertImpl crlentry = * new RevokedCertImpl(serialNo, CMS.getCurrentDate(), * crlentryexts); - * + * * return crlentry; * } */ diff --git a/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java index 7a985b631..6545b81fd 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/UniqueSubjectNameConstraint.java @@ -55,7 +55,7 @@ import com.netscape.cms.profile.def.UserSubjectNameDefault; * It checks if the subject name in the certificate is * unique in the internal database, ie, no two certificates * have the same subject name. - * + * * @version $Revision$, $Date$ */ public class UniqueSubjectNameConstraint extends EnrollConstraint { @@ -143,7 +143,7 @@ public class UniqueSubjectNameConstraint extends EnrollConstraint { /** * Validates the request. The request is not modified * during the validation. - * + * * Rules are as follows: * If the subject name is not unique, then the request will be rejected unless: * 1. the certificate is expired or expired_revoked diff --git a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java index 98a7b4f96..b7588aa4d 100644 --- a/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java +++ b/base/common/src/com/netscape/cms/profile/constraint/ValidityConstraint.java @@ -43,7 +43,7 @@ import com.netscape.cms.profile.def.ValidityDefault; * This class implements the validity constraint. * It checks if the validity in the certificate * template satisfies the criteria. - * + * * @version $Revision$, $Date$ */ public class ValidityConstraint extends EnrollConstraint { @@ -154,11 +154,11 @@ public class ValidityConstraint extends EnrollConstraint { Integer.toString(days))); } - // 613828 - // The validity field shall specify a notBefore value - // that does not precede the current time and a notAfter - // value that does not precede the value specified in - // notBefore (test can be automated; try entering violating + // 613828 + // The validity field shall specify a notBefore value + // that does not precede the current time and a notAfter + // value that does not precede the value specified in + // notBefore (test can be automated; try entering violating // time values and check result). String notBeforeCheckStr = getConfig(CONFIG_CHECK_NOT_BEFORE); boolean notBeforeCheck; |