From e02429e25cdd3274b6f56a82aee3a0b7a38e2077 Mon Sep 17 00:00:00 2001
From: Niklas Hallqvist <niklas@cvs.openbsd.org>
Date: Mon, 16 Oct 2000 23:28:05 +0000
Subject: Merge with EOM 1.12

author: niklas
missed some FEATURES-dependencies in the last commit

author: niklas
include crypto headers based on FEATURES
---
 sbin/isakmpd/crypto.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'sbin/isakmpd/crypto.h')

diff --git a/sbin/isakmpd/crypto.h b/sbin/isakmpd/crypto.h
index 7ee186c0fb7..7984bb2afe1 100644
--- a/sbin/isakmpd/crypto.h
+++ b/sbin/isakmpd/crypto.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: crypto.h,v 1.3 1998/11/17 11:10:09 niklas Exp $	*/
-/*	$EOM: crypto.h,v 1.10 1998/08/05 13:14:03 niklas Exp $	*/
+/*	$OpenBSD: crypto.h,v 1.4 2000/10/16 23:28:04 niklas Exp $	*/
+/*	$EOM: crypto.h,v 1.12 2000/10/15 21:56:41 niklas Exp $	*/
 
 /*
  * Copyright (c) 1998 Niels Provos.  All rights reserved.
@@ -38,8 +38,12 @@
 #define _CRYPTO_H_
 
 #include <des.h>
+#ifdef USE_BLOWFISH
 #include <blf.h>
+#endif
+#ifdef USE_CAST
 #include <cast.h>
+#endif
 
 #define USE_32BIT
 #if defined (USE_64BIT)
@@ -89,8 +93,12 @@ struct keystate {
   u_int8_t	*riv, *liv;
   union {
     des_key_schedule desks[3];
+#ifdef USE_BLOWFISH
     blf_ctx blfks;
+#endif
+#ifdef USE_CAST
     cast_key castks;
+#endif
   } keydata;
 };
 
-- 
cgit v1.2.3