diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | includes.h | 1 | ||||
| -rw-r--r-- | openbsd-compat/openssl-compat.c | 6 | ||||
| -rw-r--r-- | openbsd-compat/openssl-compat.h | 6 | ||||
| -rw-r--r-- | ssh-add.c | 1 | ||||
| -rw-r--r-- | ssh-agent.c | 1 | ||||
| -rw-r--r-- | ssh-keygen.c | 1 | ||||
| -rw-r--r-- | ssh.c | 1 | ||||
| -rw-r--r-- | sshd.c | 2 |
9 files changed, 18 insertions, 7 deletions
@@ -1,6 +1,10 @@ 20080228 - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes linking problems on AIX with gcc 4.1.x. + - (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. 20080225 - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack @@ -3631,4 +3635,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4842 2008/02/28 04:01:13 dtucker Exp $ +$Id: ChangeLog,v 1.4843 2008/02/28 08:13:52 dtucker Exp $ @@ -166,7 +166,6 @@ #include "platform.h" #include "openbsd-compat/openbsd-compat.h" #include "openbsd-compat/bsd-nextstep.h" -#include "openbsd-compat/openssl-compat.h" #include "entropy.h" diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index 9c9cdb98..49238ba8 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.c,v 1.5 2008/02/25 10:13:47 dtucker Exp $ */ +/* $Id: openssl-compat.c,v 1.6 2008/02/28 08:13:52 dtucker Exp $ */ /* * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> @@ -16,13 +16,15 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS #include "includes.h" #ifdef USE_OPENSSL_ENGINE # include <openssl/engine.h> #endif +#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS +#include "openssl-compat.h" + #ifdef SSH_OLD_EVP int ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type, diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index f1d2f19f..f53695aa 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.h,v 1.10 2007/06/14 13:47:31 dtucker Exp $ */ +/* $Id: openssl-compat.h,v 1.11 2008/02/28 08:13:52 dtucker Exp $ */ /* * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> @@ -79,8 +79,8 @@ extern const EVP_CIPHER *evp_acss(void); # ifdef SSLeay_add_all_algorithms # undef SSLeay_add_all_algorithms # endif -# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() -#endif +# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() +# endif int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, unsigned char *, int); @@ -42,6 +42,7 @@ #include <sys/param.h> #include <openssl/evp.h> +#include "openbsd-compat/openssl-compat.h" #include <fcntl.h> #include <pwd.h> diff --git a/ssh-agent.c b/ssh-agent.c index f1794834..6f8727b3 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -51,6 +51,7 @@ #include <openssl/evp.h> #include <openssl/md5.h> +#include "openbsd-compat/openssl-compat.h" #include <errno.h> #include <fcntl.h> diff --git a/ssh-keygen.c b/ssh-keygen.c index adacbff0..69b16e6f 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -21,6 +21,7 @@ #include <openssl/evp.h> #include <openssl/pem.h> +#include "openbsd-compat/openssl-compat.h" #include <errno.h> #include <fcntl.h> @@ -72,6 +72,7 @@ #include <openssl/evp.h> #include <openssl/err.h> +#include "openbsd-compat/openssl-compat.h" #include "xmalloc.h" #include "ssh.h" @@ -75,6 +75,8 @@ #include <openssl/bn.h> #include <openssl/md5.h> #include <openssl/rand.h> +#include "openbsd-compat/openssl-compat.h" + #ifdef HAVE_SECUREWARE #include <sys/security.h> #include <prot.h> |