diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/policy')
19 files changed, 47 insertions, 58 deletions
diff --git a/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java b/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java index 1c43d92d4..0faf7591d 100644 --- a/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java +++ b/pki/base/common/src/com/netscape/cms/policy/APolicyRule.java @@ -148,14 +148,14 @@ public abstract class APolicyRule implements IPolicyRule { * * @return nvPairs A Vector of name/value pairs. */ - public abstract Vector getInstanceParams(); + public abstract Vector<String> getInstanceParams(); /** * Return default parameters for a policy implementation. * * @return nvPairs A Vector of name/value pairs. */ - public abstract Vector getDefaultParams(); + public abstract Vector<String> getDefaultParams(); public void setError(IRequest req, String format, Object[] params) { setPolicyException(req, format, params); @@ -178,9 +178,9 @@ public abstract class APolicyRule implements IPolicyRule { } public void setPolicyException(IRequest req, EBaseException ex) { - Vector ev = req.getExtDataInStringVector(IRequest.ERRORS); + Vector<String> ev = req.getExtDataInStringVector(IRequest.ERRORS); if (ev == null) { - ev = new Vector(); + ev = new Vector<String>(); } ev.addElement(ex.toString()); req.setExtData(IRequest.ERRORS, ev); @@ -235,9 +235,9 @@ public abstract class APolicyRule implements IPolicyRule { else ex = new EPolicyException(format, params); - Vector ev = req.getExtDataInStringVector(IRequest.ERRORS); + Vector<String> ev = req.getExtDataInStringVector(IRequest.ERRORS); if (ev == null) { - ev = new Vector(); + ev = new Vector<String>(); } ev.addElement(ex.toString()); req.setExtData(IRequest.ERRORS, ev); diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java index 9ad322085..387b702bf 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/DSAKeyConstraints.java @@ -64,7 +64,7 @@ public class DSAKeyConstraints extends APolicyRule private final static String PROP_MIN_SIZE = "minSize"; private final static String PROP_MAX_SIZE = "maxSize"; - private final static Vector defConfParams = new Vector(); + private final static Vector<String> defConfParams = new Vector<String>(); private IConfigStore mConfig = null; @@ -193,9 +193,6 @@ public class DSAKeyConstraints extends APolicyRule if (keyParams == null) { // key parameters could not be parsed. - Object[] params = new Object[] { - getInstanceName(), String.valueOf(i + 1) }; - setError(req, CMS.getUserMessage("CMS_POLICY_NO_KEY_PARAMS", getInstanceName(), String.valueOf(i + 1)), ""); @@ -232,8 +229,8 @@ public class DSAKeyConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getInstanceParams() { - Vector confParams = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> confParams = new Vector<String>(); try { confParams.addElement(PROP_MIN_SIZE + "=" + mConfig.getInteger(PROP_MIN_SIZE, DEF_MIN_SIZE)); @@ -249,7 +246,7 @@ public class DSAKeyConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { + public Vector<String> getDefaultParams() { return defConfParams; } } diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java b/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java index f341dd224..2af145475 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/DefaultRevocation.java @@ -81,7 +81,7 @@ public class DefaultRevocation extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getInstanceParams() { + public Vector<String> getInstanceParams() { return null; } @@ -90,7 +90,7 @@ public class DefaultRevocation extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { + public Vector<String> getDefaultParams() { return null; } diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java index b0e27501e..a08bde78c 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/IssuerConstraints.java @@ -193,8 +193,8 @@ public class IssuerConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getInstanceParams() { - Vector confParams = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> confParams = new Vector<String>(); confParams.addElement(PROP_ISSUER_DN + "=" + mIssuerDNString); @@ -206,8 +206,8 @@ public class IssuerConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { - Vector defParams = new Vector(); + public Vector<String> getDefaultParams() { + Vector<String> defParams = new Vector<String>(); defParams.addElement(PROP_ISSUER_DN + "="); return defParams; diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java index 9bb806eba..3779b16e3 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/KeyAlgorithmConstraints.java @@ -58,7 +58,7 @@ public class KeyAlgorithmConstraints extends APolicyRule private final static String[] supportedAlgorithms = { "RSA", "DSA", "DH" }; - private final static Vector defConfParams = new Vector(); + private final static Vector<String> defConfParams = new Vector<String>(); static { defConfParams.addElement(PROP_ALGORITHMS + "=" + @@ -219,7 +219,7 @@ public class KeyAlgorithmConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { + public Vector<String> getDefaultParams() { return defConfParams; } } diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java b/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java index b93487609..3af9e636f 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/ManualAuthentication.java @@ -86,7 +86,7 @@ public class ManualAuthentication extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getInstanceParams() { + public Vector<String> getInstanceParams() { return null; } @@ -95,7 +95,7 @@ public class ManualAuthentication extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { + public Vector<String> getDefaultParams() { return null; } } diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java index 185bceed9..f3e5efc9b 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalConstraints.java @@ -62,7 +62,7 @@ public class RenewalConstraints extends APolicyRule public final static int DEF_RENEWAL_NOT_AFTER = 30; public final static long DAYS_TO_MS_FACTOR = 24L * 3600 * 1000; - private final static Vector defConfParams = new Vector(); + private final static Vector<String> defConfParams = new Vector<String>(); static { defConfParams.addElement(PROP_ALLOW_EXPIRED_CERTS + "=" + true); defConfParams.addElement(PROP_RENEWAL_NOT_AFTER + "=" + @@ -221,8 +221,8 @@ public class RenewalConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getInstanceParams() { - Vector confParams = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> confParams = new Vector<String>(); confParams.addElement( PROP_ALLOW_EXPIRED_CERTS + "=" + mAllowExpiredCerts); @@ -236,7 +236,7 @@ public class RenewalConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { + public Vector<String> getDefaultParams() { return defConfParams; } } diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java index 023605db4..0265ff855 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/RenewalValidityConstraints.java @@ -74,7 +74,7 @@ public class RenewalValidityConstraints extends APolicyRule public static final String CERT_HEADER = "-----BEGIN CERTIFICATE-----\n"; public static final String CERT_TRAILER = "-----END CERTIFICATE-----\n"; - private final static Vector defConfParams = new Vector(); + private final static Vector<String> defConfParams = new Vector<String>(); static { defConfParams.addElement(PROP_MIN_VALIDITY + "=" + @@ -281,8 +281,8 @@ public class RenewalValidityConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getInstanceParams() { - Vector confParams = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> confParams = new Vector<String>(); confParams.addElement(PROP_MIN_VALIDITY + "=" + mMinValidity / DAYS_TO_MS_FACTOR); @@ -298,7 +298,7 @@ public class RenewalValidityConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { + public Vector<String> getDefaultParams() { return defConfParams; } diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java index d4859195d..513e199c4 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/RevocationConstraints.java @@ -57,7 +57,7 @@ public class RevocationConstraints extends APolicyRule private boolean mAllowExpiredCerts = true; private boolean mAllowOnHold = true; - private final static Vector defConfParams = new Vector(); + private final static Vector<String> defConfParams = new Vector<String>(); static { defConfParams.addElement(PROP_ALLOW_EXPIRED_CERTS + "=" + true); defConfParams.addElement(PROP_ALLOW_ON_HOLD + "=" + true); @@ -194,8 +194,8 @@ public class RevocationConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getInstanceParams() { - Vector confParams = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> confParams = new Vector<String>(); confParams.addElement( PROP_ALLOW_EXPIRED_CERTS + "=" + mAllowExpiredCerts); @@ -209,7 +209,7 @@ public class RevocationConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { + public Vector<String> getDefaultParams() { return defConfParams; } } diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java index 8c2ba0796..8b504eb50 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/SigningAlgorithmConstraints.java @@ -62,7 +62,7 @@ public class SigningAlgorithmConstraints extends APolicyRule IAuthority mAuthority = null; private final static String PROP_ALGORITHMS = "algorithms"; - private final static Vector defConfParams = new Vector(); + private final static Vector<String> defConfParams = new Vector<String>(); static { StringBuffer sb = new StringBuffer(); @@ -120,7 +120,7 @@ public class SigningAlgorithmConstraints extends APolicyRule if (algNames != null) { // parse alg names into Vector StringTokenizer tok = new StringTokenizer(algNames, ","); - Vector algs = new Vector(); + Vector<String> algs = new Vector<String>(); while (tok.hasMoreTokens()) { algs.addElement(tok.nextToken().trim()); @@ -211,7 +211,7 @@ public class SigningAlgorithmConstraints extends APolicyRule int i, j, goodSize; // validate the currently-allowed algorithms - Vector goodAlgs = new Vector(); + Vector<String> goodAlgs = new Vector<String>(); for (i = 0; i < mAllowedAlgs.length; i++) { for (j = 0; j < allowed.length; j++) { @@ -324,8 +324,8 @@ public class SigningAlgorithmConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getInstanceParams() { - Vector confParams = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> confParams = new Vector<String>(); StringBuffer sb = new StringBuffer(); for (int i = 0; i < mConfigAlgs.length; i++) { @@ -343,7 +343,7 @@ public class SigningAlgorithmConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { + public Vector<String> getDefaultParams() { StringBuffer sb = new StringBuffer(); sb.append(PROP_ALGORITHMS); sb.append("="); diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java index 2b13c14af..da63f6f24 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/SubCANameConstraints.java @@ -176,8 +176,8 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli * * @return nvPairs A Vector of name/value pairs. */ - public Vector getInstanceParams() { - Vector v = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> v = new Vector<String>(); return v; } @@ -187,8 +187,8 @@ public class SubCANameConstraints extends APolicyRule implements IEnrollmentPoli * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { - Vector v = new Vector(); + public Vector<String> getDefaultParams() { + Vector<String> v = new Vector<String>(); return v; } diff --git a/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java index 1ebf9a0b8..0409f3c33 100644 --- a/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java +++ b/pki/base/common/src/com/netscape/cms/policy/constraints/ValidityConstraints.java @@ -73,7 +73,7 @@ public class ValidityConstraints extends APolicyRule public final static long DAYS_TO_MS_FACTOR = 24L * 3600 * 1000; public final static long MINS_TO_MS_FACTOR = 60L * 1000; - private final static Vector defConfParams = new Vector(); + private final static Vector<String> defConfParams = new Vector<String>(); static { defConfParams.addElement(PROP_MIN_VALIDITY + "=" + @@ -260,8 +260,8 @@ public class ValidityConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getInstanceParams() { - Vector confParams = new Vector(); + public Vector<String> getInstanceParams() { + Vector<String> confParams = new Vector<String>(); confParams.addElement(PROP_MIN_VALIDITY + "=" + mMinValidity / DAYS_TO_MS_FACTOR); @@ -281,7 +281,7 @@ public class ValidityConstraints extends APolicyRule * * @return nvPairs A Vector of name/value pairs. */ - public Vector getDefaultParams() { + public Vector<String> getDefaultParams() { return defConfParams; } diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java index 1d22d48ec..f830b7e3d 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/BasicConstraintsExt.java @@ -210,7 +210,6 @@ public class BasicConstraintsExt extends APolicyRule * @return The policy result object. */ public PolicyResult apply(IRequest req) { - PolicyResult res = PolicyResult.ACCEPTED; // get cert info. X509CertInfo[] ci = diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java index 7ea2d6fb8..597357318 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/CertificatePoliciesExt.java @@ -413,11 +413,9 @@ class CertPolicy { mNameDot + PROP_NOTICE_REF_ORG, msg)); // if a policy id is not null check that it is a valid OID. - ObjectIdentifier policyId = null; if (mPolicyId != null) - policyId = CMS.checkOID( - mNameDot + PROP_POLICY_IDENTIFIER, mPolicyId); + CMS.checkOID(mNameDot + PROP_POLICY_IDENTIFIER, mPolicyId); // if enabled, form CertificatePolicyInfo to be encoded in // extension. Policy ids should be all set. diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java index 037206b89..6594cc4a2 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/KeyUsageExt.java @@ -159,7 +159,6 @@ public class KeyUsageExt extends APolicyRule * @return The policy result object. */ public PolicyResult apply(IRequest req) { - PolicyResult res = PolicyResult.ACCEPTED; X509CertInfo[] ci = req.getExtDataInCertInfoArray(IRequest.CERT_INFO); diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java index 2d521e8d5..2fb09b2b7 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/NSCertTypeExt.java @@ -159,7 +159,6 @@ public class NSCertTypeExt extends APolicyRule */ public PolicyResult apply(IRequest req) { CMS.debug("NSCertTypeExt: Impl: " + NAME + ", Instance: " + getInstanceName() + "::apply()"); - PolicyResult res = PolicyResult.ACCEPTED; X509CertInfo[] ci = req.getExtDataInCertInfoArray(IRequest.CERT_INFO); diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java index fe2565428..3b80246a9 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/PrivateKeyUsagePeriodExt.java @@ -156,7 +156,6 @@ public class PrivateKeyUsagePeriodExt extends APolicyRule * @return The policy result object. */ public PolicyResult apply(IRequest req) { - PolicyResult res = PolicyResult.ACCEPTED; // get cert info. X509CertInfo[] ci = diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java index 0af977a24..2a5af4240 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/RemoveBasicConstraintsExt.java @@ -61,7 +61,6 @@ public class RemoveBasicConstraintsExt extends APolicyRule } public PolicyResult apply(IRequest req) { - PolicyResult res = PolicyResult.ACCEPTED; // get cert info. X509CertInfo[] ci = diff --git a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java index b4ebb4b45..6b4e7ead9 100644 --- a/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java +++ b/pki/base/common/src/com/netscape/cms/policy/extensions/SubjectDirectoryAttributesExt.java @@ -123,7 +123,6 @@ public class SubjectDirectoryAttributesExt extends APolicyRule } public PolicyResult apply(IRequest req) { - PolicyResult res = PolicyResult.ACCEPTED; X509CertInfo[] ci = req.getExtDataInCertInfoArray(IRequest.CERT_INFO); |