diff options
| author |  Kai Wasserbäch | 2011-02-11 13:22:22 +0000 |
|---|---|---|
| committer | Kai Wasserbäch | 2011-02-11 13:22:22 +0000 |
| commit | d07b987622bfc9fd13398ab412cd847541193c09 (patch) | |
| tree | db5290a5141e36439d520efad560ff07fe940014 /src/modules/file/libkvifile.cpp | |
| parent | added turkish translation (diff) | |
| download | KVIrc-d07b987622bfc9fd13398ab412cd847541193c09.tar.gz KVIrc-d07b987622bfc9fd13398ab412cd847541193c09.tar.bz2 KVIrc-d07b987622bfc9fd13398ab412cd847541193c09.zip | |
Don't make Crypto++ and OpenSSL support mutally exclusive.
This allows using SSL encrypted connections and still use Crypto++ for
the remaining cryptographic functions.
Signed-off-by: Kai Wasserbäch <curan@debian.org>
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5466 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/file/libkvifile.cpp')
| -rw-r--r-- | src/modules/file/libkvifile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index c30236114..1a3816bbb 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -37,7 +37,7 @@ #include <QTextCodec> #include <QByteArray> -#if defined(COMPILE_SSL_SUPPORT) +#if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_CRYPTOPP_SUPPORT) // The current implementation #include <openssl/evp.h> #elif defined(COMPILE_CRYPTOPP_SUPPORT) @@ -1420,7 +1420,7 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c) return true; } -#if defined(COMPILE_SSL_SUPPORT) +#if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_CRYPTOPP_SUPPORT) if(szAlgo.isEmpty()) szAlgo = "md5"; EVP_MD_CTX mdctx; |