summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-11-01 09:32:34 +1100
committerDamien Miller <djm@mindrot.org>2001-11-01 09:32:34 +1100
commit14a5c99b5c84ab86b34baf4b9e8f454118164815 (patch)
treeea2c1bdb66a8870c7aa5a8bc6d7bdc5142548a23
parent12eceb2efc8b8310e041a89339c671c86cfce386 (diff)
- (djm) Compat define for OpenSSL < 0.9.6 (No OPENSSL_free)
-rw-r--r--ChangeLog5
-rw-r--r--defines.h8
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e010df9..fcad3ab9 100644
--- 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 060b6f35..838f1093 100644
--- 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.