diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | openbsd-compat/openssl-compat.c | 6 | ||||
| -rw-r--r-- | openbsd-compat/openssl-compat.h | 4 |
3 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,7 @@ +2006022 + - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Minor tidy up: only + compile in compat code if required. + 20060221 - (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about redefinition of SSLeay_add_all_algorithms. @@ -3873,4 +3877,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (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 $ diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c index 763f84734..45ebd3f66 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c @@ -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> @@ -49,14 +49,14 @@ ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *evp) } #endif +#ifdef USE_OPENSSL_ENGINE void ssh_SSLeay_add_all_algorithms(void) { SSLeay_add_all_algorithms(); -#ifdef USE_OPENSSL_ENGINE /* Enable use of crypto hardware */ ENGINE_load_builtin_engines(); ENGINE_register_all_complete(); -#endif } +#endif diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 01fc41e3a..c582cd269 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h @@ -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> @@ -70,11 +70,11 @@ extern const EVP_CIPHER *evp_acss(void); # undef SSLeay_add_all_algorithms # endif # define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() -void ssh_SSLeay_add_all_algorithms(void); #endif int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, unsigned char *, int); int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int); int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *); +void ssh_SSLeay_add_all_algorithms(void); #endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */ |