summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/x509.c
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2002-06-10 20:45:36 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2002-06-10 20:45:36 +0000
commitbb15a4aaca62df563e32ae3abd46a2869412377b (patch)
treea879e73adda61d6aae02ac90f1775c16c6d33e86 /sbin/isakmpd/x509.c
parentc2964edabc7bd876c3b9ab2dad90b45bdcd5a5b7 (diff)
Zap a few remaining libkeynote refs.
Diffstat (limited to 'sbin/isakmpd/x509.c')
-rw-r--r--sbin/isakmpd/x509.c18
1 files changed, 7 insertions, 11 deletions
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);