summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-03-12 17:41:36 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-03-12 17:41:36 (GMT)
commit16f5905b4f14f41239c34480888305ab5bfaf60e (patch)
tree1d32b305b2aa50f31c54b2c7edaca0b42bb8dd74 /Swiften/TLS/OpenSSL
parentd1a913e2b94e01ebe3f91aff547c37ba8b2cd125 (diff)
downloadswift-contrib-16f5905b4f14f41239c34480888305ab5bfaf60e.zip
swift-contrib-16f5905b4f14f41239c34480888305ab5bfaf60e.tar.bz2
Fixed OpenSSL compilation.
Diffstat (limited to 'Swiften/TLS/OpenSSL')
-rw-r--r--Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
index bc39c1b..0b2df5b 100644
--- a/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
+++ b/Swiften/TLS/OpenSSL/OpenSSLCertificate.cpp
@@ -23,9 +23,9 @@ OpenSSLCertificate::OpenSSLCertificate(boost::shared_ptr<X509> cert) : cert(cert
OpenSSLCertificate::OpenSSLCertificate(const ByteArray& der) {
#if OPENSSL_VERSION_NUMBER <= 0x009070cfL
- unsigned char* p = reinterpret_cast<unsigned char*>(const_cast<char*>(der.getData()));
+ unsigned char* p = const_cast<unsigned char*>(der.getData());
#else
- const unsigned char* p = reinterpret_cast<const unsigned char*>(der.getData());
+ const unsigned char* p = der.getData();
#endif
cert = boost::shared_ptr<X509>(d2i_X509(NULL, &p, der.getSize()), X509_free);
if (!cert) {