diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | openbsd-compat/openssl-compat.h | 9 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20060221 | ||
2 | - (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about | ||
3 | redefinition of SSLeay_add_all_algorithms. | ||
4 | |||
1 | 20060220 | 5 | 20060220 |
2 | - (dtucker) [INSTALL configure.ac openbsd-compat/openssl-compat.{c,h}] | 6 | - (dtucker) [INSTALL configure.ac openbsd-compat/openssl-compat.{c,h}] |
3 | Add optional enabling of OpenSSL's (hardware) Engine support, via | 7 | Add optional enabling of OpenSSL's (hardware) Engine support, via |
@@ -3869,4 +3873,4 @@ | |||
3869 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3873 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3870 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3874 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3871 | 3875 | ||
3872 | $Id: ChangeLog,v 1.4131 2006/02/20 09:17:35 dtucker Exp $ | 3876 | $Id: ChangeLog,v 1.4132 2006/02/21 13:00:27 dtucker Exp $ |
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 1196d71ea..01fc41e3a 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.h,v 1.4 2006/02/20 09:17:36 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.h,v 1.5 2006/02/21 13:00:28 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> |
@@ -65,8 +65,13 @@ extern const EVP_CIPHER *evp_acss(void); | |||
65 | # define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a)) | 65 | # define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a)) |
66 | # endif /* SSH_OLD_EVP */ | 66 | # endif /* SSH_OLD_EVP */ |
67 | 67 | ||
68 | # define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() | 68 | # ifdef USE_OPENSSL_ENGINE |
69 | # ifdef SSLeay_add_all_algorithms | ||
70 | # undef SSLeay_add_all_algorithms | ||
71 | # endif | ||
72 | # define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() | ||
69 | void ssh_SSLeay_add_all_algorithms(void); | 73 | void ssh_SSLeay_add_all_algorithms(void); |
74 | #endif | ||
70 | 75 | ||
71 | int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, | 76 | int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, |
72 | unsigned char *, int); | 77 | unsigned char *, int); |