- (dtucker) [key.c defines.h openbsd-compat/openssl-compat.h] Move old OpenSSL

   compat glue into openssl-compat.h.

diff --git a/ChangeLog b/ChangeLog
index 8841bce7850ab5550c406c756a02f05b1324286a..b2007e877f139baeaa2e58b6de1c6e190623027b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
    openbsd-compat/openssl-compat.{c,h}] Bug #1437 Move the OpenSSL compat
    header to after OpenSSL headers, since some versions of OpenSSL have
    SSLeay_add_all_algorithms as a macro already.
+ - (dtucker) [key.c defines.h openbsd-compat/openssl-compat.h] Move old OpenSSL
+   compat glue into openssl-compat.h.
 
 20080225
  - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack

diff --git a/defines.h b/defines.h
index 276542df640142815ba91cf8712371a6cfe1c349..ee5649dc5f6201428a153a0dbed26020b306dacd 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -567,11 +567,6 @@ struct winsize {
 # define CUSTOM_SSH_AUDIT_EVENTS
 #endif
 
-/* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */
-#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f)
-# define OPENSSL_free(x) Free(x)
-#endif
-
 #if !defined(HAVE___func__) && defined(HAVE___FUNCTION__)
 #  define __func__ __FUNCTION__
 #elif !defined(HAVE___func__)

diff --git a/key.c b/key.c
index 8fef9b40f659d3607fdf9d821fcde61c757a8e7f..62bf8361d6791caea9bae2be052eb3ae125cc269 100644 (file)
--- a/key.c
+++ b/key.c
@@ -38,6 +38,7 @@
 #include <sys/types.h>
 
 #include <openssl/evp.h>
+#include <openbsd-compat/openssl-compat.h>
 
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 6068bf2138b885c9f1e25aebf85ba27ec2707b71..f08362ff992ad50d74979a4db8d9bba82a597387 100644 (file)
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -19,6 +19,11 @@
 #include "includes.h"
 #include <openssl/evp.h>
 
+/* OPENSSL_free() is Free() in versions before OpenSSL 0.9.6 */
+#if !defined(OPENSSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x0090600f)
+# define OPENSSL_free(x) Free(x)
+#endif
+
 #if OPENSSL_VERSION_NUMBER < 0x00906000L
 # define SSH_OLD_EVP
 # define EVP_CIPHER_CTX_get_app_data(e)                ((e)->app_data)