summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2001-07-14 06:10:27 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2001-07-14 06:10:27 +0000
commitdd340d43a6cc61a487c86d701e5f83951bc6fad5 (patch)
tree661ab7a043d6a1879afd5d21c561b14090e6cfd8
parent73b53faa23137f8383ec0a58a604bf5b87b76422 (diff)
downloadATCD-dd340d43a6cc61a487c86d701e5f83951bc6fad5.tar.gz
ChangeLogTag:Fri Jul 13 23:02:46 2001 Ossama Othman <ossama@uci.edu>
Diffstat
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLogs/ChangeLog-02a10
-rw-r--r--ChangeLogs/ChangeLog-03a10
-rw-r--r--ace/SSL/SSL_Asynch_BIO.cpp9
-rw-r--r--ace/SSL/SSL_Asynch_BIO.h5
-rw-r--r--ace/SSL/SSL_Asynch_Stream.cpp5
-rw-r--r--ace/SSL/SSL_Asynch_Stream.h7
7 files changed, 44 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 4502c6f98b0..50ea48f3d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jul 13 23:02:46 2001 Ossama Othman <ossama@uci.edu>
+
+ * ace/SSL/SSL_Asynch_Stream.h:
+ * ace/SSL/SSL_Asynch_Stream.cpp:
+ * ace/SSL/SSL_Asynch_BIO.h:
+ * ace/SSL/SSL_Asynch_BIO.cpp:
+
+ Only support asynchronous SSL streams when using OpenSSL >
+ 0.9.5a. The BIO method signatures changed in OpenSSL 0.9.6.
+
Fri Jul 13 22:48:56 2001 Ossama Othman <ossama@uci.edu>
* ace/SSL/SSL_Asynch_BIO.cpp (methods_ACE):
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 4502c6f98b0..50ea48f3d43 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Fri Jul 13 23:02:46 2001 Ossama Othman <ossama@uci.edu>
+
+ * ace/SSL/SSL_Asynch_Stream.h:
+ * ace/SSL/SSL_Asynch_Stream.cpp:
+ * ace/SSL/SSL_Asynch_BIO.h:
+ * ace/SSL/SSL_Asynch_BIO.cpp:
+
+ Only support asynchronous SSL streams when using OpenSSL >
+ 0.9.5a. The BIO method signatures changed in OpenSSL 0.9.6.
+
Fri Jul 13 22:48:56 2001 Ossama Othman <ossama@uci.edu>
* ace/SSL/SSL_Asynch_BIO.cpp (methods_ACE):
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 4502c6f98b0..50ea48f3d43 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Fri Jul 13 23:02:46 2001 Ossama Othman <ossama@uci.edu>
+
+ * ace/SSL/SSL_Asynch_Stream.h:
+ * ace/SSL/SSL_Asynch_Stream.cpp:
+ * ace/SSL/SSL_Asynch_BIO.h:
+ * ace/SSL/SSL_Asynch_BIO.cpp:
+
+ Only support asynchronous SSL streams when using OpenSSL >
+ 0.9.5a. The BIO method signatures changed in OpenSSL 0.9.6.
+
Fri Jul 13 22:48:56 2001 Ossama Othman <ossama@uci.edu>
* ace/SSL/SSL_Asynch_BIO.cpp (methods_ACE):
diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp
index c4f87be8771..f55daf14e76 100644
--- a/ace/SSL/SSL_Asynch_BIO.cpp
+++ b/ace/SSL/SSL_Asynch_BIO.cpp
@@ -1,6 +1,5 @@
// -*- C++ -*-
-
#include "SSL_Asynch_BIO.h"
#include "SSL_Asynch_Stream.h"
@@ -8,7 +7,7 @@ ACE_RCSID (ACE_SSL,
SSL_Asynch_BIO,
"$Id$")
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
#define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK )
@@ -22,7 +21,8 @@ static BIO_METHOD methods_ACE =
NULL, /* ACE_Asynch_BIO_gets, */
ACE_Asynch_BIO_ctrl,
ACE_Asynch_BIO_new,
- ACE_Asynch_BIO_free
+ ACE_Asynch_BIO_free,
+ NULL
};
BIO_METHOD *
@@ -195,4 +195,5 @@ ACE_Asynch_BIO_puts (BIO *pBIO, const char *str)
return ACE_Asynch_BIO_write (pBIO, str, n);
}
-#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
+#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 ||
+ ACE_HAS_AIO_CALLS) */
diff --git a/ace/SSL/SSL_Asynch_BIO.h b/ace/SSL/SSL_Asynch_BIO.h
index 92fbdb4c110..d615db06b33 100644
--- a/ace/SSL/SSL_Asynch_BIO.h
+++ b/ace/SSL/SSL_Asynch_BIO.h
@@ -23,7 +23,7 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
#include <openssl/bio.h>
@@ -43,7 +43,8 @@ extern "C"
}
//@}
-#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
+#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL (ACE_WIN32 ||
+ ACE_HAS_AIO_CALLS) */
#include "ace/post.h"
diff --git a/ace/SSL/SSL_Asynch_Stream.cpp b/ace/SSL/SSL_Asynch_Stream.cpp
index 030506e12c2..d4b43e4ed0f 100644
--- a/ace/SSL/SSL_Asynch_Stream.cpp
+++ b/ace/SSL/SSL_Asynch_Stream.cpp
@@ -7,7 +7,7 @@ ACE_RCSID (ACE_SSL,
"$Id$")
// This only works on platforms with Asynchronous IO support.
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
#if defined (ACE_WIN32)
@@ -1110,4 +1110,5 @@ ACE_SSL_Asynch_Stream::pending_BIO_count (void)
return ret;
}
-#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
+#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 ||
+ ACE_HAS_AIO_CALLS) */
diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h
index 753998e0cb8..16470b1309e 100644
--- a/ace/SSL/SSL_Asynch_Stream.h
+++ b/ace/SSL/SSL_Asynch_Stream.h
@@ -21,9 +21,7 @@
#pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
-
-#include <openssl/err.h>
+#if OPENSSL_VERSION_NUMBER > 0x0090581fL && ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
#include "ace/Asynch_IO_Impl.h"
#include "ace/Message_Block.h"
@@ -229,7 +227,8 @@ protected:
};
-#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
+#endif /* OPENSSL_VERSION_NUMBER > 0x0090581fL && (ACE_WIN32 ||
+ ACE_HAS_AIO_CALLS) */
#include "ace/post.h"
View Lorry Controller Status