diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2006-02-21 14:00:27 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2006-02-21 14:00:27 +0100 |
| commit | 3322e0d421676a6931fe01efdd5e0f34af8e5da2 (patch) | |
| tree | 1f8f435b4b7dcb9cca7372752d26b4f57db2fafc /openbsd-compat | |
| parent | - (dtucker) [INSTALL configure.ac openbsd-compat/openssl-compat.{c,h}] (diff) | |
| download | openssh-3322e0d421676a6931fe01efdd5e0f34af8e5da2.tar.xz openssh-3322e0d421676a6931fe01efdd5e0f34af8e5da2.zip | |
- (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about
redefinition of SSLeay_add_all_algorithms.
Diffstat (limited to 'openbsd-compat')
| -rw-r--r-- | openbsd-compat/openssl-compat.h | 9 |
1 files changed, 7 insertions, 2 deletions
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 @@ -/* $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> @@ -65,8 +65,13 @@ extern const EVP_CIPHER *evp_acss(void); # define EVP_CIPHER_CTX_cleanup(a) ssh_EVP_CIPHER_CTX_cleanup((a)) # endif /* SSH_OLD_EVP */ -# define SSLeay_add_all_algorithms() ssh_SSLeay_add_all_algorithms() +# 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() void ssh_SSLeay_add_all_algorithms(void); +#endif int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *, unsigned char *, int); |