From bb15a4aaca62df563e32ae3abd46a2869412377b Mon Sep 17 00:00:00 2001
From: Hakan Olsson <ho@cvs.openbsd.org>
Date: Mon, 10 Jun 2002 20:45:36 +0000
Subject: Zap a few remaining libkeynote refs.

---
 sbin/isakmpd/ike_quick_mode.c |  8 ++------
 sbin/isakmpd/x509.c           | 18 +++++++-----------
 2 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'sbin/isakmpd')

diff --git a/sbin/isakmpd/ike_quick_mode.c b/sbin/isakmpd/ike_quick_mode.c
index 0272dec11c9..b0471cd423b 100644
--- a/sbin/isakmpd/ike_quick_mode.c
+++ b/sbin/isakmpd/ike_quick_mode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ike_quick_mode.c,v 1.63 2002/06/10 18:08:58 ho Exp $	*/
+/*	$OpenBSD: ike_quick_mode.c,v 1.64 2002/06/10 20:45:35 ho Exp $	*/
 /*	$EOM: ike_quick_mode.c,v 1.139 2001/01/26 10:43:17 niklas Exp $	*/
 
 /*
@@ -1594,7 +1594,7 @@ responder_recv_HASH_SA_NONCE (struct message *msg)
   if (message_negotiate_sa (msg, check_policy))
     goto cleanup;
 #else
-  if (message_negotiate_sa (msg, libkeynote ? check_policy : 0))
+  if (message_negotiate_sa (msg, 0))
     goto cleanup;
 #endif
 #else
@@ -1693,11 +1693,7 @@ responder_recv_HASH_SA_NONCE (struct message *msg)
 	}
     }
 #if !defined (USE_POLICY) && !defined (USE_KEYNOTE)
-#ifdef USE_POLICY
-  else if (!libkeynote)
-#else
   else
-#endif
     {
       /*
        * This code is no longer necessary, as policy determines acceptance
diff --git a/sbin/isakmpd/x509.c b/sbin/isakmpd/x509.c
index 8a8ba584fa0..025b7da254b 100644
--- a/sbin/isakmpd/x509.c
+++ b/sbin/isakmpd/x509.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: x509.c,v 1.71 2002/06/10 18:08:59 ho Exp $	*/
+/*	$OpenBSD: x509.c,v 1.72 2002/06/10 20:45:35 ho Exp $	*/
 /*	$EOM: x509.c,v 1.54 2001/01/16 18:42:16 ho Exp $	*/
 
 /*
@@ -895,17 +895,13 @@ x509_cert_insert (int id, void *scert)
     }
 
 #ifdef USE_POLICY
-#ifdef USE_KEYNOTE
   if (x509_generate_kn (id, cert) == 0)
-#else
-    if (libkeynote && x509_generate_kn (id, cert) == 0)
-#endif
-      {
-	LOG_DBG ((LOG_POLICY, 50,
-		  "x509_cert_insert: x509_generate_kn failed"));
-	X509_free (cert);
-	return 0;
-      }
+    {
+      LOG_DBG ((LOG_POLICY, 50,
+		"x509_cert_insert: x509_generate_kn failed"));
+      X509_free (cert);
+      return 0;
+    }
 #endif /* USE_POLICY */
 
   res = x509_hash_enter (cert);
-- 
cgit v1.2.3