tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [includes.h ssh-add.c ssh-agent.c ssh-keygen.c ssh.c sshd.c

Browse Source 
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.
This commit is contained in:
Darren Tucker 2008-02-28 19:13:52 +11:00
parent e1c4c54211
commit bfaaf960a0
9 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,6 +1,10 @@
20080228 20080228
- (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes - (dtucker) [configure.ac] Add -fstack-protector to LDFLAGS too, fixes
linking problems on AIX with gcc 4.1.x. 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 20080225
- (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack - (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 OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ 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 $

1
includes.h
View File

@ -166,7 +166,6 @@
#include "platform.h" #include "platform.h"
#include "openbsd-compat/openbsd-compat.h" #include "openbsd-compat/openbsd-compat.h"
#include "openbsd-compat/bsd-nextstep.h" #include "openbsd-compat/bsd-nextstep.h"
#include "openbsd-compat/openssl-compat.h"
#include "entropy.h" #include "entropy.h"

6
openbsd-compat/openssl-compat.c
View File

@ -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> * 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. * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
#include "includes.h" #include "includes.h"
#ifdef USE_OPENSSL_ENGINE #ifdef USE_OPENSSL_ENGINE
# include <openssl/engine.h> # include <openssl/engine.h>
#endif #endif
#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
#include "openssl-compat.h"
#ifdef SSH_OLD_EVP #ifdef SSH_OLD_EVP
int int
ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type, ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type,

6
openbsd-compat/openssl-compat.h
View File

@ -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> * 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 # ifdef SSLeay_add_all_algorithms
# undef SSLeay_add_all_algorithms # undef SSLeay_add_all_algorithms
# endif # endif
# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() # define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms()
#endif # endif
int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *,
unsigned char *, int); unsigned char *, int);

1
ssh-add.c
View File

@ -42,6 +42,7 @@
#include <sys/param.h> #include <sys/param.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include "openbsd-compat/openssl-compat.h"
#include <fcntl.h> #include <fcntl.h>
#include <pwd.h> #include <pwd.h>

1
ssh-agent.c
View File

@ -51,6 +51,7 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/md5.h> #include <openssl/md5.h>
#include "openbsd-compat/openssl-compat.h"
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

1
ssh-keygen.c
View File

@ -21,6 +21,7 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include "openbsd-compat/openssl-compat.h"
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

1
ssh.c
View File

@ -72,6 +72,7 @@
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
#include "openbsd-compat/openssl-compat.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "ssh.h" #include "ssh.h"

2
sshd.c
View File

@ -75,6 +75,8 @@
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/md5.h> #include <openssl/md5.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include "openbsd-compat/openssl-compat.h"
#ifdef HAVE_SECUREWARE #ifdef HAVE_SECUREWARE
#include <sys/security.h> #include <sys/security.h>
#include <prot.h> #include <prot.h>