diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-03-08 08:42:49 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-03-08 08:42:49 +0000 |
| commit | 1d1e9e39c4203e7ca07e25b76edad6efd85f4817 (patch) | |
| tree | 6c6ef90959d33570767ae4d858b64ae71bb57c37 /sbin | |
| parent | 86280107d36e02ae0e282473c233e165f8bd988e (diff) | |
cert.c: Merge with EOM 1.15
libcrypto.h: Merge with EOM 1.12
author: ho
KAME and ssl includes
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/cert.c | 12 | ||||
| -rw-r--r-- | sbin/isakmpd/libcrypto.h | 23 |
2 files changed, 24 insertions, 11 deletions
diff --git a/sbin/isakmpd/cert.c b/sbin/isakmpd/cert.c index e1bd5092d32..d38169e75ae 100644 --- a/sbin/isakmpd/cert.c +++ b/sbin/isakmpd/cert.c @@ -1,5 +1,5 @@ -/* $OpenBSD: cert.c,v 1.12 2000/02/19 19:32:53 niklas Exp $ */ -/* $EOM: cert.c,v 1.14 2000/02/19 07:58:54 niklas Exp $ */ +/* $OpenBSD: cert.c,v 1.13 2000/03/08 08:42:48 niklas Exp $ */ +/* $EOM: cert.c,v 1.15 2000/03/07 23:37:54 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niels Provos. All rights reserved. @@ -40,10 +40,14 @@ #include <stdlib.h> #include <string.h> -#include <ssl/ssl.h> - #include "sysdep.h" +#ifdef KAME +# include <openssl/ssl.h> +#else +# include <ssl/ssl.h> +#endif + #include "cert.h" #include "isakmp_num.h" #include "log.h" diff --git a/sbin/isakmpd/libcrypto.h b/sbin/isakmpd/libcrypto.h index 9f3c593c091..df693f4e32f 100644 --- a/sbin/isakmpd/libcrypto.h +++ b/sbin/isakmpd/libcrypto.h @@ -1,5 +1,5 @@ -/* $OpenBSD: libcrypto.h,v 1.5 2000/02/07 01:32:54 niklas Exp $ */ -/* $EOM: libcrypto.h,v 1.11 2000/02/07 01:30:36 angelos Exp $ */ +/* $OpenBSD: libcrypto.h,v 1.6 2000/03/08 08:42:48 niklas Exp $ */ +/* $EOM: libcrypto.h,v 1.12 2000/03/07 23:37:54 ho Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. @@ -39,12 +39,21 @@ #define _LIBCRYPTO_H_ #include <stdio.h> + +#ifdef KAME +# include <openssl/ssl.h> +# include <openssl/bio.h> +# include <openssl/pem.h> +# include <openssl/x509_vfy.h> +# include <openssl/x509.h> +#else /* XXX I want #include <ssl/cryptall.h> but we appear to not install meth.h */ -#include <ssl/ssl.h> -#include <ssl/bio.h> -#include <ssl/pem.h> -#include <ssl/x509_vfy.h> -#include <ssl/x509.h> +# include <ssl/ssl.h> +# include <ssl/bio.h> +# include <ssl/pem.h> +# include <ssl/x509_vfy.h> +# include <ssl/x509.h> +#endif /* KAME */ extern void *libcrypto; |