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

   redefinition of SSLeay_add_all_algorithms.

diff --git a/ChangeLog b/ChangeLog
index 4188d7df31a581a770f9707c45146eeab229a4c9..53bddfeb8d2811d56f7a75986b9909cb9bdeb0a8 100644 (file)
--- 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

diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 54b454341fa27f26c23e4752b85a5ec5c915e4cd..a7ef1feebe53192b629f8a11a19fda686c77ce10 100644 (file)
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -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);