From c72f75f5391a14b13c03f91d9f6553a852cb8dd2 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Wed, 6 May 2009 13:20:40 +0000
Subject: [PATCH] Drop chk_time.

---
 ykval-common.php | 2 +-
 ykval-db.sql     | 6 +++---
 ykval-verify.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ykval-common.php b/ykval-common.php
index 6da0c72..11a22b4 100644
--- a/ykval-common.php
+++ b/ykval-common.php
@@ -212,7 +212,7 @@ function addNewKey($conn, $devId) {
 // $clientId: The decimal client identity
 function getClientData($conn, $clientId) {
 	$stmt =
-	  'SELECT id, secret, chk_time '.
+	  'SELECT id, secret '.
 	  'FROM clients '.
 	  'WHERE active AND id='.mysql_quote($clientId);
 	$r = query($conn, $stmt);
diff --git a/ykval-db.sql b/ykval-db.sql
index 4febd4d..847e651 100644
--- a/ykval-db.sql
+++ b/ykval-db.sql
@@ -6,9 +6,9 @@ CREATE TABLE clients (
   id INT NOT NULL AUTO_INCREMENT,
   active BOOLEAN DEFAULT TRUE,
   created DATETIME NOT NULL,
-  email VARCHAR(255) NOT NULL DEFAULT '',
+  email VARCHAR(255),
   secret VARCHAR(60) NOT NULL DEFAULT '',
-  chk_time BOOLEAN DEFAULT TRUE,
+  notes VARCHAR(100),
   PRIMARY KEY (id)
 );
 
@@ -30,6 +30,6 @@ CREATE TABLE yubikeys (
 CREATE USER ykval_verifier;
 GRANT SELECT,INSERT,UPDATE(accessed, counter, low, high, sessionUse)
        ON ykval.yubikeys to 'ykval_verifier'@'localhost';
-GRANT SELECT(id, secret, chk_time, active)
+GRANT SELECT(id, secret, active)
        ON ykval.clients to 'ykval_verifier'@'localhost';
 FLUSH PRIVILEGES;
diff --git a/ykval-verify.php b/ykval-verify.php
index 11a26d1..8f3c530 100644
--- a/ykval-verify.php
+++ b/ykval-verify.php
@@ -163,7 +163,7 @@ if ($sessionCounter == $seenSessionCounter && $sessionUse > $seenSessionUse) {
 	round(100*$percent) . '%');
   if ($deviation > TS_ABS_TOLERANCE && $percent > TS_REL_TOLERANCE) {
     debug("OTP failed phishing test");
-    if ($cd['chk_time']) {
+    if (0) {
       sendResp(S_DELAYED_OTP);
       exit;
     }