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/str | |
| 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/str')
| -rw-r--r-- | src/modules/str/libkvistr.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index dbaa79cbe..8026a0a6b 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -38,12 +38,12 @@ #include <QRegExp> #include <QClipboard> -#if defined( COMPILE_SSL_SUPPORT ) && !defined( COMPILE_NO_EMBEDDED_CODE ) +#if defined( COMPILE_SSL_SUPPORT ) // The current implementation #include <KviSSL.h> #include <openssl/evp.h> #include <openssl/pem.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, @@ -1371,7 +1371,7 @@ static bool str_kvs_fnc_digest(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("algorithm",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szType) KVSM_PARAMETERS_END(c) -#if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_NO_EMBEDDED_CODE) +#if defined(COMPILE_SSL_SUPPORT) if(szType.isEmpty()) szType = "md5"; EVP_MD_CTX mdctx; @@ -1405,7 +1405,7 @@ static bool str_kvs_fnc_digest(KviKvsModuleFunctionCall * c) } c->returnValue()->setString(szResult); -#elif defined(COMPILE_NO_EMBEDDED_CODE) +#elif defined(COMPILE_CRYPTOPP_SUPPORT) // Crypto++ implementation std::string szDigest; std::string szMsg = szString.toLocal8Bit().data(); @@ -2234,7 +2234,7 @@ static bool str_kvs_fnc_evpSign(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("password",KVS_PT_NONEMPTYCSTRING,KVS_PF_OPTIONAL,szPass) KVSM_PARAMETERS_END(c) -#if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_NO_EMBEDDED_CODE) +#if defined(COMPILE_SSL_SUPPORT) KviSSL::globalSSLInit(); EVP_MD_CTX md_ctx; @@ -2366,7 +2366,7 @@ static bool str_kvs_fnc_evpVerify(KviKvsModuleFunctionCall * c) KVSM_PARAMETER("password",KVS_PT_NONEMPTYCSTRING,KVS_PF_OPTIONAL,szPass) KVSM_PARAMETERS_END(c) -#if defined(COMPILE_SSL_SUPPORT) && !defined(COMPILE_NO_EMBEDDED_CODE) +#if defined(COMPILE_SSL_SUPPORT) KviSSL::globalSSLInit(); szSign = QByteArray::fromBase64(szSignB64); |