- (djm) [openbsd-compat/bsd-snprintf.c] Fix integer overflow in return

[openssh.git] / openbsd-compat / openssl-compat.h

diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 54b454341fa27f26c23e4752b85a5ec5c915e4cd..36a09f6bad7878e49b10eac11fd0bbc343ca6b57 100644 (file)
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -65,11 +65,16 @@ 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()
-void ssh_SSLeay_add_all_algorithms(void);
+# 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()
+#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 */