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

   redefinition of SSLeay_add_all_algorithms.

2 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c0bd1e9d..43d09104f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20060221
+ - (dtucker) [openbsd-compat/openssl-compat.h] Prevent warning about
+   redefinition of SSLeay_add_all_algorithms.
+
 20060220
  - (dtucker) [INSTALL configure.ac openbsd-compat/openssl-compat.{c,h}]
    Add optional enabling of OpenSSL's (hardware) Engine support, via
@@ -3869,4 +3873,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.4131 2006/02/20 09:17:35 dtucker Exp $
+$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 @@
-/* $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);