summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-04-22 01:01:35 +0200
committerMichael Tänzer <neo@nhng.de>2014-04-22 01:01:35 +0200
commitf2a1f6b62b83f7e2a11d1700bca31f227e17fc14 (patch)
treeb72bedcc5021e3b1d4a6bddd7b157f20f9234fd0
parentbb16f087e8921f9fc9b247791810f3e70a84daac (diff)
downloadcacert-devel-f2a1f6b62b83f7e2a11d1700bca31f227e17fc14.tar.gz
cacert-devel-f2a1f6b62b83f7e2a11d1700bca31f227e17fc14.tar.xz
cacert-devel-f2a1f6b62b83f7e2a11d1700bca31f227e17fc14.zip
bug 1221: Add comments and restrict TTP assurances
Signed-off-by: Michael Tänzer <neo@nhng.de>
-rw-r--r--includes/notary.inc.php18
1 files changed, 15 insertions, 3 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index 49dc09d..9b641f5 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -133,22 +133,34 @@
switch ($row['method'])
{
+ // These programmes have been revoked
case 'Thawte Points Transfer': // revoke all Thawte-points (as per arbitration)
case 'CT Magazine - Germany': // revoke c't (only one test-entry)
case 'Temporary Increase': // revoke 'temporary increase' (Current usage breaks audit aspects, needs to be reimplemented)
$points = 0;
break;
+
case 'Administrative Increase': // ignore AI with 2 points or less (historical for experiance points, now other calculation)
if ($points <= 2) // maybe limit to 35/50 pts in the future?
$points = 0;
break;
+
+ // TTP assurances, limit to 35
+ case 'TTP-Assisted':
+ $points = min($points, 35);
+ break;
+
+ // TTP TOPUP, limit to 30
+ case 'TOPUP':
+ $points = min($points, 30);
+
+ // All these should be preserved for the time being
case 'Unknown': // to be revoked in the future? limit to max 50 pts?
case 'Trusted Third Parties': // to be revoked in the future? limit to max 35 pts?
- case 'TTP-Assisted': // TTP assurances, limit to 35
- case 'TOPUP': // TOPUP to be delevoped in the future, limit to 30
case '': // to be revoked in the future? limit to max 50 pts?
- case 'Face to Face Meeting': // normal assurances, limit to 35/50 pts in the future?
+ case 'Face to Face Meeting': // normal assurances (and superassurances?), limit to 35/50 pts in the future?
break;
+
default: // should never happen ... ;-)
$points = 0;
}