summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/OpenSSLUtils.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-09-28 19:59:40 +0000
committerMarc Laukien <marc@zeroc.com>2002-09-28 19:59:40 +0000
commita46dbf9951edb25908ee2342d96c8948080f3b2d (patch)
tree69edeff1a51dc4350a12e8f26c81025b4f74167c /cpp/src/IceSSL/OpenSSLUtils.cpp
parentRemoved slice task tagdir attribute from build.xml (diff)
downloadice-a46dbf9951edb25908ee2342d96c8948080f3b2d.tar.bz2
ice-a46dbf9951edb25908ee2342d96c8948080f3b2d.tar.xz
ice-a46dbf9951edb25908ee2342d96c8948080f3b2d.zip
minor changes for gcc 3.2
Diffstat (limited to 'cpp/src/IceSSL/OpenSSLUtils.cpp')
-rw-r--r--cpp/src/IceSSL/OpenSSLUtils.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/cpp/src/IceSSL/OpenSSLUtils.cpp b/cpp/src/IceSSL/OpenSSLUtils.cpp
index 2e264cfb791..e46386337f3 100644
--- a/cpp/src/IceSSL/OpenSSLUtils.cpp
+++ b/cpp/src/IceSSL/OpenSSLUtils.cpp
@@ -9,8 +9,10 @@
// **********************************************************************
#include <IceUtil/Mutex.h>
-#include <IceSSL/OpenSSLUtils.h>
+
#include <IceSSL/OpenSSLPluginI.h>
+#include <IceSSL/OpenSSLUtils.h>
+
#include <openssl/err.h>
using namespace std;
@@ -507,9 +509,10 @@ verifyCallback(int ok, X509_STORE_CTX* ctx)
{
assert(ctx != 0);
- // Tricky method to get access to our connection. I would use SSL_get_ex_data() to get
- // the Connection object, if only I had some way to retrieve the index of the object
- // in this function. Hence, we have to invent our own reference system here.
+ // Tricky method to get access to our connection. I would use
+ // SSL_get_ex_data() to get the Connection object, if only I had
+ // some way to retrieve the index of the object in this function.
+ // Hence, we have to invent our own reference system here.
SSL* sslConnection = static_cast<SSL*>(X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx()));
assert(sslConnection != 0);