diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/file/libkvifile.cpp | 8 | ||||
| -rw-r--r-- | src/modules/rijndael/CMakeLists.txt | 56 | ||||
| -rw-r--r-- | src/modules/str/libkvistr.cpp | 12 |
3 files changed, 37 insertions, 39 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(); diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt index 2881a1ade..546ca9bdf 100644 --- a/src/modules/rijndael/CMakeLists.txt +++ b/src/modules/rijndael/CMakeLists.txt @@ -1,37 +1,35 @@ # CMakeLists for src/modules/rijndael -IF(WANT_NO_EMBEDDED_CODE OR WANT_OPENSSL) +IF(WANT_CRYPTOPP OR WANT_OPENSSL) -SUBDIRS(caps) + SUBDIRS(caps) -IF(WANT_NO_EMBEDDED_CODE) - ADD_DEFINITIONS("-fexceptions") + IF(WANT_CRYPTOPP) + SET(kvirijndael_SRCS + libkvirijndael_cryptopp.cpp + UglyBase64.cpp + ) - SET(kvirijndael_SRCS - libkvirijndael_cryptopp.cpp - UglyBase64.cpp - ) + SET(kvirijndael_MOC_HDRS + libkvirijndael_cryptopp.h + ) + ELSE(WANT_CRYPTOPP) + SET(kvirijndael_SRCS + libkvirijndael.cpp + Rijndael.cpp + BlowFish.cpp + UglyBase64.cpp + ) - SET(kvirijndael_MOC_HDRS - libkvirijndael_cryptopp.h - ) -ELSE(WANT_NO_EMBEDDED_CODE) - SET(kvirijndael_SRCS - libkvirijndael.cpp - Rijndael.cpp - BlowFish.cpp - UglyBase64.cpp - ) + SET(kvirijndael_MOC_HDRS + libkvirijndael.h + ) + ENDIF(WANT_CRYPTOPP) - SET(kvirijndael_MOC_HDRS - libkvirijndael.h - ) -ENDIF(WANT_NO_EMBEDDED_CODE) + # After this call, files will be moc'ed to moc_kvi_*.cpp + QT4_WRAP_CPP(kvirijndael_MOC_SRCS ${kvirijndael_MOC_HDRS}) -# After this call, files will be moc'ed to moc_kvi_*.cpp -QT4_WRAP_CPP(kvirijndael_MOC_SRCS ${kvirijndael_MOC_HDRS}) + SET(ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS} -fno-strict-aliasing") -SET(ADDITIONAL_LINK_FLAGS "${ADDITIONAL_LINK_FLAGS} -fno-strict-aliasing") - -SET(kvi_module_name kvirijndael) -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) -ENDIF(WANT_NO_EMBEDDED_CODE OR WANT_OPENSSL) + SET(kvi_module_name kvirijndael) + INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt) +ENDIF(WANT_CRYPTOPP OR WANT_OPENSSL) 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); |