From 8e2cfa67b1633672a2bb8d9403617c57ccf1ca21 Mon Sep 17 00:00:00 2001 From: Niklas Hallqvist Date: Sat, 7 Oct 2000 06:59:17 +0000 Subject: Merge with EOM 1.16 author: niklas Multiple subject name matching, makes certificate interop with PGPnet at least partly working. Added some error checking. author: ho Nowadays we can use #include instead of --- sbin/isakmpd/libcrypto.h | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/sbin/isakmpd/libcrypto.h b/sbin/isakmpd/libcrypto.h index 2e1ca1e7866..7f6841ddb3c 100644 --- a/sbin/isakmpd/libcrypto.h +++ b/sbin/isakmpd/libcrypto.h @@ -1,8 +1,8 @@ -/* $OpenBSD: libcrypto.h,v 1.7 2000/04/07 22:06:20 niklas Exp $ */ -/* $EOM: libcrypto.h,v 1.14 2000/03/31 15:29:03 ho Exp $ */ +/* $OpenBSD: libcrypto.h,v 1.8 2000/10/07 06:59:16 niklas Exp $ */ +/* $EOM: libcrypto.h,v 1.16 2000/09/28 12:53:27 niklas Exp $ */ /* - * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. + * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. * Copyright (c) 1999, 2000 Angelos D. Keromytis. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,20 +42,12 @@ #include -#ifdef KAME -# include -# include -# include -# include -# include -#else /* XXX I want #include but we appear to not install meth.h */ -# include -# include -# include -# include -# include -#endif /* KAME */ +#include +#include +#include +#include +#include extern void *libcrypto; @@ -139,6 +131,7 @@ extern X509 *(*lc_d2i_X509) (X509 **, unsigned char **, long); extern int (*lc_i2d_RSAPublicKey) (RSA *, unsigned char **); extern int (*lc_i2d_RSAPrivateKey) (RSA *, unsigned char **); extern int (*lc_i2d_X509) (X509 *, unsigned char **); +extern int (*lc_i2d_X509_NAME) (X509_NAME *, unsigned char **); #if SSLEAY_VERSION_NUMBER >= 0x00904100L extern void (*lc_sk_X509_free) (STACK_OF (X509) *); extern STACK_OF (X509) *(*lc_sk_X509_new_null) (void); -- cgit v1.2.3