diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 18:39:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 18:39:13 +0000 |
| commit | 1432e823600df8006f4d642a082d405de29abcc8 (patch) | |
| tree | 4d34d9f08a0f3a2d27980c2915f0b2b1424e4b23 | |
| parent | 30dce8269018ce1db5d40b5252cea24b919c25c6 (diff) | |
we do not care about __APPLE__
| -rw-r--r-- | sbin/isakmpd/crypto.h | 12 | ||||
| -rw-r--r-- | sbin/isakmpd/hash.c | 7 |
2 files changed, 2 insertions, 17 deletions
diff --git a/sbin/isakmpd/crypto.h b/sbin/isakmpd/crypto.h index ff3f06c9bf2..f370dfe5818 100644 --- a/sbin/isakmpd/crypto.h +++ b/sbin/isakmpd/crypto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.h,v 1.16 2005/04/08 16:06:25 deraadt Exp $ */ +/* $OpenBSD: crypto.h,v 1.17 2005/04/08 18:39:12 deraadt Exp $ */ /* $EOM: crypto.h,v 1.12 2000/10/15 21:56:41 niklas Exp $ */ /* @@ -32,20 +32,10 @@ #ifndef _CRYPTO_H_ #define _CRYPTO_H_ -#if defined (__APPLE__) - -#include <openssl/des.h> -#include <openssl/blowfish.h> -#include <openssl/cast.h> - -#else - #include <des.h> #include <blf.h> #include <cast.h> -#endif /* __APPLE__ */ - #include <openssl/aes.h> #define USE_32BIT diff --git a/sbin/isakmpd/hash.c b/sbin/isakmpd/hash.c index 6aab504d713..abf3597fef9 100644 --- a/sbin/isakmpd/hash.c +++ b/sbin/isakmpd/hash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hash.c,v 1.18 2005/02/27 13:12:12 hshoexer Exp $ */ +/* $OpenBSD: hash.c,v 1.19 2005/04/08 18:39:12 deraadt Exp $ */ /* $EOM: hash.c,v 1.10 1999/04/17 23:20:34 niklas Exp $ */ /* @@ -32,13 +32,8 @@ #include <sys/param.h> #include <string.h> -#if defined (__APPLE__) -#include <openssl/md5.h> -#include <openssl/sha.h> -#else #include <md5.h> #include <sha1.h> -#endif /* __APPLE__ */ #include "sysdep.h" |