diff options
| author | cfu <cfu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-06-10 22:00:51 +0000 |
|---|---|---|
| committer | cfu <cfu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-06-10 22:00:51 +0000 |
| commit | f6e925b8404423461e5f75736029fc9797d9acd5 (patch) | |
| tree | 99b4141ed1b0970b12191c3e0e4a264b1d1a26a2 /pki | |
| parent | 5429c74ba185b5ff74388bfad49bcf56c7ac9583 (diff) | |
| download | pki-f6e925b8404423461e5f75736029fc9797d9acd5.tar.gz pki-f6e925b8404423461e5f75736029fc9797d9acd5.tar.xz pki-f6e925b8404423461e5f75736029fc9797d9acd5.zip | |
Bug 480255 - User Certificate gets renewed when cert is not in grace period
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@581 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki')
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java b/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java index cd95db83d..599142497 100644 --- a/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java +++ b/pki/base/common/src/com/netscape/cms/profile/constraint/RenewGracePeriodConstraint.java @@ -98,8 +98,8 @@ public class RenewGracePeriodConstraint extends EnrollConstraint { String renew_grace_after_s = getConfig(CONFIG_RENEW_GRACE_AFTER); int renew_grace_before = 0; int renew_grace_after = 0; - long renew_grace_before_l = 0; - long renew_grace_after_l= 0; + BigInteger renew_grace_before_BI = new BigInteger(renew_grace_before_s); + BigInteger renew_grace_after_BI= new BigInteger(renew_grace_after_s); // -1 means no limit if (renew_grace_before_s == "") @@ -113,9 +113,9 @@ public class RenewGracePeriodConstraint extends EnrollConstraint { renew_grace_after = Integer.parseInt(renew_grace_after_s); if (renew_grace_before > 0) - renew_grace_before_l = renew_grace_before * 1000 * 86400; + renew_grace_before_BI = renew_grace_before_BI.multiply(BigInteger.valueOf(1000 * 86400)); if (renew_grace_after > 0) - renew_grace_after_l = renew_grace_after * 1000 * 86400; + renew_grace_after_BI = renew_grace_after_BI.multiply(BigInteger.valueOf(1000 * 86400)); Date current = CMS.getCurrentDate(); long millisDiff = origExpDate.getTime() - current.getTime(); @@ -129,14 +129,14 @@ public class RenewGracePeriodConstraint extends EnrollConstraint { * the one with negative value is ignored */ if (millisDiff >= 0) { - if ((renew_grace_before>0) && (millisDiff > renew_grace_before_l)) { + if ((renew_grace_before>0) && (millisDiff > renew_grace_before_BI.longValue())) { throw new ERejectException(CMS.getUserMessage(getLocale(req), "CMS_PROFILE_RENEW_OUTSIDE_GRACE_PERIOD", renew_grace_before+" days before and "+ renew_grace_after+" days after original cert expiration date")); } } else { - if ((renew_grace_after > 0) && ((0-millisDiff) > renew_grace_after_l)) { + if ((renew_grace_after > 0) && ((0-millisDiff) > renew_grace_after_BI.longValue())) { throw new ERejectException(CMS.getUserMessage(getLocale(req), "CMS_PROFILE_RENEW_OUTSIDE_GRACE_PERIOD", renew_grace_before+" days before and "+ |