summaryrefslogtreecommitdiff
path: root/openbsd-compat/openssl-compat.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-02-28 19:13:52 +1100
committerDarren Tucker <dtucker@zip.com.au>2008-02-28 19:13:52 +1100
commitbfaaf960a0204d5ee8ed75af05104737a54b4a52 (patch)
tree8bbe75c53e48afb6ed451e15a812d61a19c53660 /openbsd-compat/openssl-compat.h
parente1c4c542116fd41eec7dcb0d0b40d0797181c959 (diff)
- (dtucker) [includes.h ssh-add.c ssh-agent.c ssh-keygen.c ssh.c sshd.c
openbsd-compat/openssl-compat.{c,h}] Bug #1437 Move the OpenSSL compat header to after OpenSSL headers, since some versions of OpenSSL have SSLeay_add_all_algorithms as a macro already.
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
-rw-r--r--openbsd-compat/openssl-compat.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index f1d2f19fc..f53695aa8 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openssl-compat.h,v 1.10 2007/06/14 13:47:31 dtucker Exp $ */ 1/* $Id: openssl-compat.h,v 1.11 2008/02/28 08:13:52 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> 4 * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -79,8 +79,8 @@ extern const EVP_CIPHER *evp_acss(void);
79# ifdef SSLeay_add_all_algorithms 79# ifdef SSLeay_add_all_algorithms
80# undef SSLeay_add_all_algorithms 80# undef SSLeay_add_all_algorithms
81# endif 81# endif
82# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() 82# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms()
83#endif 83# endif
84 84
85int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, 85int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *,
86 unsigned char *, int); 86 unsigned char *, int);