cert.c: Merge with EOM 1.15

libcrypto.h: Merge with EOM 1.12

author: ho
KAME and ssl includes

diff --git a/sbin/isakmpd/cert.c b/sbin/isakmpd/cert.c
index e1bd509..d38169e 100644 (file)
--- 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 9f3c593..df693f4 100644 (file)
--- 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;