diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-03-08 08:42:28 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-03-08 08:42:28 +0000 |
commit | 14004c86ca6035568699535fbcba0438b75339fb (patch) | |
tree | 751099d291e128c8606a348079bb4303eca7477f /sbin/isakmpd | |
parent | cce84c1ce972474bb568ac1e13a2645ddb60ae5b (diff) |
Merge with EOM 1.7
author: ho
Add sysdep.h and compile with KAME
Diffstat (limited to 'sbin/isakmpd')
-rw-r--r-- | sbin/isakmpd/apps/certpatch/certpatch.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/sbin/isakmpd/apps/certpatch/certpatch.c b/sbin/isakmpd/apps/certpatch/certpatch.c index 518c8f32d87..47d671a0418 100644 --- a/sbin/isakmpd/apps/certpatch/certpatch.c +++ b/sbin/isakmpd/apps/certpatch/certpatch.c @@ -1,5 +1,5 @@ -/* $OpenBSD: certpatch.c,v 1.7 2000/02/01 02:46:17 niklas Exp $ */ -/* $EOM: certpatch.c,v 1.6 2000/01/31 22:33:50 niklas Exp $ */ +/* $OpenBSD: certpatch.c,v 1.8 2000/03/08 08:42:27 niklas Exp $ */ +/* $EOM: certpatch.c,v 1.7 2000/03/08 02:47:45 ho Exp $ */ /* * Copyright (c) 1999 Niels Provos. All rights reserved. @@ -58,9 +58,19 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <ssl/rsa.h> -#include <ssl/x509.h> -#include <ssl/pem.h> +#include "sysdep.h" + +#ifdef KAME +# ifdef CRYPTO +# include <openssl/rsa.h> +# endif +# include <openssl/x509.h> +# include <openssl/pem.h> +#else +# include <ssl/rsa.h> +# include <ssl/x509.h> +# include <ssl/pem.h> +#endif #include "conf.h" #include "log.h" |