RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about 

redefinition of SSLeay_add_all_algorithms.
This commit is contained in:
Darren Tucker 2006-02-22 00:00:27 +11:00
parent fabdb6c290
commit 3322e0d421
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20060221
- (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about
redefinition of SSLeay_add_all_algorithms.
20060220 20060220
- (dtucker) [INSTALL configure.ac openbsd-compat/openssl-compat.{c,h}] - (dtucker) [INSTALL configure.ac openbsd-compat/openssl-compat.{c,h}]
Add optional enabling of OpenSSL's (hardware) Engine support, via Add optional enabling of OpenSSL's (hardware) Engine support, via
@ -3869,4 +3873,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4131 2006/02/20 09:17:35 dtucker Exp $ $Id: ChangeLog,v 1.4132 2006/02/21 13:00:27 dtucker Exp $

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

@ -1,4 +1,4 @@
/* $Id: openssl-compat.h,v 1.4 2006/02/20 09:17:36 dtucker Exp $ */ /* $Id: openssl-compat.h,v 1.5 2006/02/21 13:00:28 dtucker Exp $ */
/* /*
* Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@ -65,8 +65,13 @@ extern const EVP_CIPHER *evp_acss(void);
# define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a)) # define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a))
# endif /* SSH_OLD_EVP */ # endif /* SSH_OLD_EVP */
# ifdef USE_OPENSSL_ENGINE
# ifdef SSLeay_add_all_algorithms
# undef SSLeay_add_all_algorithms
# endif
# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() # define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms()
void ssh_SSLeay_add_all_algorithms(void); void ssh_SSLeay_add_all_algorithms(void);
#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);