diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-04-07 22:06:21 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-04-07 22:06:21 +0000 |
| commit | fcc90b44960767d443ea08955e1b84b4af4c0ac9 (patch) | |
| tree | 211473e006a83ac843fd87023b81a495bd3a3e7d /sbin/isakmpd/libcrypto.h | |
| parent | ba8cd7a167d81fa7d10ee202588fa5ff6c433b59 (diff) | |
libcrypto.c: Merge with EOM 1.13
libcrypto.h: Merge with EOM 1.14
author: ho
Name change for 0.9.5; {SSLeay,OpenSSL}_add_all_algorithms.
author: ho
Missing #ifdef USE_X509 added
Diffstat (limited to 'sbin/isakmpd/libcrypto.h')
| -rw-r--r-- | sbin/isakmpd/libcrypto.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sbin/isakmpd/libcrypto.h b/sbin/isakmpd/libcrypto.h index df693f4e32f..2e1ca1e7866 100644 --- a/sbin/isakmpd/libcrypto.h +++ b/sbin/isakmpd/libcrypto.h @@ -1,5 +1,5 @@ -/* $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 $ */ +/* $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 $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. @@ -38,6 +38,8 @@ #ifndef _LIBCRYPTO_H_ #define _LIBCRYPTO_H_ +#ifdef USE_X509 + #include <stdio.h> #ifdef KAME @@ -95,7 +97,11 @@ extern int (*lc_RSA_private_encrypt) (int, unsigned char *, unsigned char *, extern int (*lc_RSA_public_decrypt) (int, unsigned char *, unsigned char *, RSA *, int); extern int (*lc_RSA_size) (RSA *); +#if OPENSSL_VERSION_NUMBER >= 0x00905100L +extern void (*lc_OpenSSL_add_all_algorithms) (void); +#else extern void (*lc_SSLeay_add_all_algorithms) (void); +#endif extern int (*lc_X509_NAME_cmp) (X509_NAME *, X509_NAME *); extern void (*lc_X509_OBJECT_free_contents) (X509_OBJECT *); extern void (*lc_X509_STORE_CTX_cleanup) (X509_STORE_CTX *); @@ -177,6 +183,8 @@ extern STACK *(*lc_sk_new) (int (*) ()); #endif +#endif + extern void libcrypto_init (void); #endif /* _LIBCRYPTO_H_ */ |