diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-04-07 22:07:08 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-04-07 22:07:08 +0000 |
| commit | 81affe2bd1f1bf14dcae90dca4f02dcd7955cc3c (patch) | |
| tree | 5a26ce5c82513b38cf4745305076c563c0af5216 /sbin | |
| parent | 37cb64a3f83eb6a043b923b180e754615a49064a (diff) | |
Merge with EOM 1.16
author: ho
Missing #ifdef USE_X509 added
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/cert.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sbin/isakmpd/cert.c b/sbin/isakmpd/cert.c index d38169e75ae..6f241c911bc 100644 --- a/sbin/isakmpd/cert.c +++ b/sbin/isakmpd/cert.c @@ -1,5 +1,5 @@ -/* $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 $ */ +/* $OpenBSD: cert.c,v 1.14 2000/04/07 22:07:07 niklas Exp $ */ +/* $EOM: cert.c,v 1.16 2000/03/14 19:43:31 ho Exp $ */ /* * Copyright (c) 1998, 1999 Niels Provos. All rights reserved. @@ -42,16 +42,18 @@ #include "sysdep.h" +#include "isakmp_num.h" +#include "log.h" +#include "cert.h" + +#ifdef USE_X509 +#include "x509.h" #ifdef KAME # include <openssl/ssl.h> #else # include <ssl/ssl.h> #endif - -#include "cert.h" -#include "isakmp_num.h" -#include "log.h" -#include "x509.h" +#endif struct cert_handler cert_handler[] = { #ifdef USE_X509 |