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 @@ | |||
1 | 20080228 | 1 | 20080228 |
2 | - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes | 2 | - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes |
3 | linking problems on AIX with gcc 4.1.x. | 3 | linking problems on AIX with gcc 4.1.x. |
4 | - (dtucker) [includes.h ssh-add.c ssh-agent.c ssh-keygen.c ssh.c sshd.c | ||
5 | openbsd-compat/openssl-compat.{c,h}] Bug #1437 Move the OpenSSL compat | ||
6 | header to after OpenSSL headers, since some versions of OpenSSL have | ||
7 | SSLeay_add_all_algorithms as a macro already. | ||
4 | 8 | ||
5 | 20080225 | 9 | 20080225 |
6 | - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack | 10 | - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack |
@@ -3631,4 +3635,4 @@ | |||
3631 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3635 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3632 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3636 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3633 | 3637 | ||
3634 | $Id: ChangeLog,v 1.4842 2008/02/28 04:01:13 dtucker Exp $ | 3638 | $Id: ChangeLog,v 1.4843 2008/02/28 08:13:52 dtucker Exp $ |
diff --git a/includes.h b/includes.h index af231a9b3..9fcf1b023 100644 --- a/includes.h +++ b/includes.h | |||
@@ -166,7 +166,6 @@ | |||
166 | #include "platform.h" | 166 | #include "platform.h" |
167 | #include "openbsd-compat/openbsd-compat.h" | 167 | #include "openbsd-compat/openbsd-compat.h" |
168 | #include "openbsd-compat/bsd-nextstep.h" | 168 | #include "openbsd-compat/bsd-nextstep.h" |
169 | #include "openbsd-compat/openssl-compat.h" | ||
170 | 169 | ||
171 | #include "entropy.h" | 170 | #include "entropy.h" |
172 | 171 | ||
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index 9c9cdb98e..49238ba80 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.c,v 1.5 2008/02/25 10:13:47 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.c,v 1.6 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> |
@@ -16,13 +16,15 @@ | |||
16 | * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 16 | * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #define SSH_DONT_OVERLOAD_OPENSSL_FUNCS | ||
20 | #include "includes.h" | 19 | #include "includes.h" |
21 | 20 | ||
22 | #ifdef USE_OPENSSL_ENGINE | 21 | #ifdef USE_OPENSSL_ENGINE |
23 | # include <openssl/engine.h> | 22 | # include <openssl/engine.h> |
24 | #endif | 23 | #endif |
25 | 24 | ||
25 | #define SSH_DONT_OVERLOAD_OPENSSL_FUNCS | ||
26 | #include "openssl-compat.h" | ||
27 | |||
26 | #ifdef SSH_OLD_EVP | 28 | #ifdef SSH_OLD_EVP |
27 | int | 29 | int |
28 | ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type, | 30 | 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 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 | ||
85 | int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, | 85 | int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, |
86 | unsigned char *, int); | 86 | unsigned char *, int); |
@@ -42,6 +42,7 @@ | |||
42 | #include <sys/param.h> | 42 | #include <sys/param.h> |
43 | 43 | ||
44 | #include <openssl/evp.h> | 44 | #include <openssl/evp.h> |
45 | #include "openbsd-compat/openssl-compat.h" | ||
45 | 46 | ||
46 | #include <fcntl.h> | 47 | #include <fcntl.h> |
47 | #include <pwd.h> | 48 | #include <pwd.h> |
diff --git a/ssh-agent.c b/ssh-agent.c index f17948349..6f8727b33 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -51,6 +51,7 @@ | |||
51 | 51 | ||
52 | #include <openssl/evp.h> | 52 | #include <openssl/evp.h> |
53 | #include <openssl/md5.h> | 53 | #include <openssl/md5.h> |
54 | #include "openbsd-compat/openssl-compat.h" | ||
54 | 55 | ||
55 | #include <errno.h> | 56 | #include <errno.h> |
56 | #include <fcntl.h> | 57 | #include <fcntl.h> |
diff --git a/ssh-keygen.c b/ssh-keygen.c index adacbff0b..69b16e6f5 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -21,6 +21,7 @@ | |||
21 | 21 | ||
22 | #include <openssl/evp.h> | 22 | #include <openssl/evp.h> |
23 | #include <openssl/pem.h> | 23 | #include <openssl/pem.h> |
24 | #include "openbsd-compat/openssl-compat.h" | ||
24 | 25 | ||
25 | #include <errno.h> | 26 | #include <errno.h> |
26 | #include <fcntl.h> | 27 | #include <fcntl.h> |
@@ -72,6 +72,7 @@ | |||
72 | 72 | ||
73 | #include <openssl/evp.h> | 73 | #include <openssl/evp.h> |
74 | #include <openssl/err.h> | 74 | #include <openssl/err.h> |
75 | #include "openbsd-compat/openssl-compat.h" | ||
75 | 76 | ||
76 | #include "xmalloc.h" | 77 | #include "xmalloc.h" |
77 | #include "ssh.h" | 78 | #include "ssh.h" |
@@ -75,6 +75,8 @@ | |||
75 | #include <openssl/bn.h> | 75 | #include <openssl/bn.h> |
76 | #include <openssl/md5.h> | 76 | #include <openssl/md5.h> |
77 | #include <openssl/rand.h> | 77 | #include <openssl/rand.h> |
78 | #include "openbsd-compat/openssl-compat.h" | ||
79 | |||
78 | #ifdef HAVE_SECUREWARE | 80 | #ifdef HAVE_SECUREWARE |
79 | #include <sys/security.h> | 81 | #include <sys/security.h> |
80 | #include <prot.h> | 82 | #include <prot.h> |