diff options
| author |  Fabio Bas | 2011-02-07 16:41:22 +0000 |
|---|---|---|
| committer | Fabio Bas | 2011-02-07 16:41:22 +0000 |
| commit | a69708e0b3e14fe21b43f6db7799c9932328aefb (patch) | |
| tree | cdd3bac44aa0f0f09bb2f9a03f429fbde9eab9cc /src/modules/file | |
| parent | added a disclaimer on "why we don't support longer keylengths" in mircryption... (diff) | |
| download | KVIrc-a69708e0b3e14fe21b43f6db7799c9932328aefb.tar.gz KVIrc-a69708e0b3e14fe21b43f6db7799c9932328aefb.tar.bz2 KVIrc-a69708e0b3e14fe21b43f6db7799c9932328aefb.zip | |
Some cmake-related changes:
cleaned up the KVIRC_BUILD_FLAGS mess, now every #ifdef used in the code should have its own #define/#undef in kvi_sysconfig.h
removed the old WITH_* family of flags, use the native cmake WANT_* options that avoids caching problems and permits to both set and unset the option
use WANT_CRYPTOPP for cryptopp code (was: WANT_NO_EMBEDDED_CODE), and disable WANT_OPENSSL when the user wants tom switch to cryptopp
updated INSTALL file accordingly
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5430 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/file')
| -rw-r--r-- | src/modules/file/libkvifile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index 0f6536e35..c30236114 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -37,10 +37,10 @@ #include <QTextCodec> #include <QByteArray> -#if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_NO_EMBEDDED_CODE) +#if defined(COMPILE_SSL_SUPPORT) // The current implementation #include <openssl/evp.h> -#elif defined(COMPILE_NO_EMBEDDED_CODE) +#elif defined(COMPILE_CRYPTOPP_SUPPORT) // The preferred new implementation (until QCryptographicHash supports all // hashes we want). // As Crypto++ is concerned for security they warn about MD5 and friends, @@ -1420,7 +1420,7 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c) return true; } -#if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_NO_EMBEDDED_CODE) +#if defined(COMPILE_SSL_SUPPORT) if(szAlgo.isEmpty()) szAlgo = "md5"; EVP_MD_CTX mdctx; @@ -1452,7 +1452,7 @@ static bool file_kvs_fnc_digest(KviKvsModuleFunctionCall * c) #endif szResult.append(cBuffer); } -#elif defined(COMPILE_NO_EMBEDDED_CODE) +#elif defined(COMPILE_CRYPTOPP_SUPPORT) // Crypto++ implementation std::string szDigest; std::string szMsg = szFile.toLocal8Bit().data(); |