- (djm) Compat define for OpenSSL < 0.9.6 (No OPENSSL_free)

diff --git a/ChangeLog b/ChangeLog
index 4e010df9b3f2276378d9570e055c99e780c6d902..fcad3ab91f5a6b2ee7463caca803ec51e26d0a89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20011123
+ - (djm) Compat define for OpenSSL < 0.9.6 (No OPENSSL_free)
+
 20011031
  - (djm) Unsmoke drugs: config files should be noreplace.
 
@@ -6792,4 +6795,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1629 2001/10/30 23:31:13 djm Exp $
+$Id: ChangeLog,v 1.1630 2001/10/31 22:32:34 djm Exp $

diff --git a/defines.h b/defines.h
index 060b6f3563f0c24e2da898849d0559d7e5e45439..838f1093b63bb04c03ea3a942eafcb05b033d326 100644 (file)
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.74 2001/10/30 02:50:40 tim Exp $ */
+/* $Id: defines.h,v 1.75 2001/10/31 22:32:34 djm Exp $ */
 
 /* Necessary headers */
 
@@ -45,6 +45,7 @@
 #include <unistd.h> /* For STDIN_FILENO, etc */
 #include <termios.h> /* Struct winsize */
 #include <fcntl.h> /* For O_NONBLOCK */
+#include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */
 
 /* *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively */
 #ifdef HAVE_STRINGS_H
@@ -450,6 +451,11 @@ struct winsize {
 # define getpgrp() getpgrp(0)
 #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
+
 /*
  * Define this to use pipes instead of socketpairs for communicating with the
  * client program.  Socketpairs do not seem to work on all systems.