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/fish/libkvifish.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/fish/libkvifish.cpp')
| -rw-r--r-- | src/modules/fish/libkvifish.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp index 0f2d9c81a..2b80d2eff 100644 --- a/src/modules/fish/libkvifish.cpp +++ b/src/modules/fish/libkvifish.cpp @@ -53,7 +53,7 @@ // KviApplication.cpp extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager; - #ifdef COMPILE_SSL_SUPPORT + #if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_CRYPTOPP_SUPPORT) #include <KviSSL.h> #include <openssl/blowfish.h> @@ -90,7 +90,7 @@ static bool fish_DH1080_gen(unsigned char ** szPubKey, int * iLen) { - #ifdef COMPILE_SSL_SUPPORT + #if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_CRYPTOPP_SUPPORT) if(!g_fish_dh) { BIGNUM * dhp = BN_new(); @@ -236,7 +236,7 @@ KviCString szFinalKey; - #ifdef COMPILE_SSL_SUPPORT + #if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_CRYPTOPP_SUPPORT) unsigned char * secret=(unsigned char *) KviMemory::allocate(DH_size(g_fish_dh)); int secretLen; BIGNUM *bn = BN_bin2bn((unsigned char *) szHisPubKey.data(), szHisPubKey.size(),NULL); @@ -341,7 +341,7 @@ static bool fish_module_init(KviModule * m) { #ifdef COMPILE_CRYPT_SUPPORT - #ifdef COMPILE_SSL_SUPPORT + #if defined( COMPILE_SSL_SUPPORT) && !defined(COMPILE_CRYPTOPP_SUPPORT) KviSSL::globalSSLInit(); #endif m->kvsRegisterAppEventHandler(KviEvent_OnQueryNotice,fish_event_onQueryNotice); |