summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-12-19 22:00:03 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-12-19 22:00:03 +0000
commitfcba14d934f39edc4dfd2ef88c3e46492ffad1cb (patch)
tree816ec73a9f8ea246abcd54eedfd493bfd7609849 /sbin
parentae01c5a7e09efa6ab6b4d5f0779b2aeb6b3c085b (diff)
make sure isakmpd works with the openssl-0.9.6 API
Diffstat (limited to 'sbin')
-rw-r--r--sbin/isakmpd/libcrypto.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/isakmpd/libcrypto.c b/sbin/isakmpd/libcrypto.c
index 41a97e26d50..d30001dd96d 100644
--- a/sbin/isakmpd/libcrypto.c
+++ b/sbin/isakmpd/libcrypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: libcrypto.c,v 1.7 2000/10/07 06:57:08 niklas Exp $ */
+/* $OpenBSD: libcrypto.c,v 1.8 2000/12/19 22:00:02 markus Exp $ */
/* $EOM: libcrypto.c,v 1.14 2000/09/28 12:53:27 niklas Exp $ */
/*
@@ -108,7 +108,7 @@ int (*lc_i2d_RSAPublicKey) (RSA *, unsigned char **);
int (*lc_i2d_RSAPrivateKey) (RSA *, unsigned char **);
int (*lc_i2d_X509) (X509 *, unsigned char **);
int (*lc_i2d_X509_NAME) (X509_NAME *, unsigned char **);
-#if SSLEAY_VERSION_NUMBER >= 0x00904100L
+#if (SSLEAY_VERSION_NUMBER >= 0x00904100L && SSLEAY_VERSION_NUMBER < 0x0090600fL)
void (*lc_sk_X509_free) (STACK_OF (X509) *);
STACK_OF (X509) *(*lc_sk_X509_new_null) ();
#else
@@ -177,7 +177,7 @@ static struct dynload_script libcrypto_script[] = {
SYMENTRY (i2d_RSAPrivateKey),
SYMENTRY (i2d_X509),
SYMENTRY (i2d_X509_NAME),
-#if SSLEAY_VERSION_NUMBER >= 0x00904100L
+#if (SSLEAY_VERSION_NUMBER >= 0x00904100L && SSLEAY_VERSION_NUMBER < 0x0090600fL)
SYMENTRY (sk_X509_free),
SYMENTRY (sk_X509_new_null),
#else