tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [openbsd-compat/openssl-compat.{c,h}] Minor tidy up: only 

compile in compat code if required.
This commit is contained in:
Darren Tucker 2006-02-22 22:24:47 +11:00
parent 3322e0d421
commit 94413cf32b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
2006022
- (dtucker) [openbsd-compat/openssl-compat.{c,h}] Minor tidy up: only
compile in compat code if required.
20060221 20060221
- (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about - (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about
redefinition of SSLeay_add_all_algorithms. redefinition of SSLeay_add_all_algorithms.
@ -3873,4 +3877,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.4132 2006/02/21 13:00:27 dtucker Exp $ $Id: ChangeLog,v 1.4133 2006/02/22 11:24:47 dtucker Exp $

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

@ -1,4 +1,4 @@
/* $Id: openssl-compat.c,v 1.3 2006/02/20 09:17:36 dtucker Exp $ */ /* $Id: openssl-compat.c,v 1.4 2006/02/22 11:24:47 dtucker Exp $ */
/* /*
* Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@ -49,14 +49,14 @@ ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *evp)
} }
#endif #endif
#ifdef USE_OPENSSL_ENGINE
void void
ssh_SSLeay_add_all_algorithms(void) ssh_SSLeay_add_all_algorithms(void)
{ {
SSLeay_add_all_algorithms(); SSLeay_add_all_algorithms();
#ifdef USE_OPENSSL_ENGINE
/* Enable use of crypto hardware */ /* Enable use of crypto hardware */
ENGINE_load_builtin_engines(); ENGINE_load_builtin_engines();
ENGINE_register_all_complete(); ENGINE_register_all_complete();
#endif
} }
#endif

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

@ -1,4 +1,4 @@
/* $Id: openssl-compat.h,v 1.5 2006/02/21 13:00:28 dtucker Exp $ */ /* $Id: openssl-compat.h,v 1.6 2006/02/22 11:24:47 dtucker Exp $ */
/* /*
* Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@ -70,11 +70,11 @@ extern const EVP_CIPHER *evp_acss(void);
# 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()
void ssh_SSLeay_add_all_algorithms(void);
#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);
int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int);
int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *);
void ssh_SSLeay_add_all_algorithms(void);
#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */