aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/lamerizer/libkvilamerizer.cpp4
-rw-r--r--src/modules/rijndael/libkvirijndael.cpp29
-rw-r--r--src/modules/rijndael/libkvirijndael.h1
-rw-r--r--src/modules/rot13/libkvirot13.cpp2
4 files changed, 18 insertions, 18 deletions
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 52298fae8..0041deb35 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -217,7 +217,7 @@ static bool lamerizer_module_init(KviModule * m)
d->m_szName = "Lamerizer";
d->m_szAuthor = "Szymon Stefanek and Jan Wagner";
d->m_szDescription = __tr2qs("A really lame text transformation engine :D");
- d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT;
+ d->m_iFlags = KviCryptEngine::CanEncrypt;
d->m_allocFunc = allocLamerizerEngine;
d->m_deallocFunc = deallocLamerizerEngine;
m->registerCryptEngine(d);
@@ -227,7 +227,7 @@ static bool lamerizer_module_init(KviModule * m)
d->m_szName = "LamerizerLight";
d->m_szAuthor = "Szymon Stefanek and Jan Wagner";
d->m_szDescription = __tr2qs("A really lame text transformation engine: Light Version.");
- d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT;
+ d->m_iFlags = KviCryptEngine::CanEncrypt;
d->m_allocFunc = allocLightLamerizerEngine;
d->m_deallocFunc = deallocLamerizerEngine;
m->registerCryptEngine(d);
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index a60f15587..3ec5e46a7 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -63,7 +63,6 @@
#if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN)
#include "KviMemory.h"
- #include "KviMemory.h"
#include "KviPointerList.h"
static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
@@ -722,8 +721,8 @@ static bool rijndael_module_init(KviModule * m)
d->m_szName = "Rijndael128Hex";
d->m_szAuthor = "Szymon Stefanek";
d->m_szDescription = QString(szFormat).arg(__tr2qs("hexadecimal")).arg(128);
- d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
- KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
+ d->m_iFlags = KviCryptEngine::CanEncrypt | KviCryptEngine::CanDecrypt |
+ KviCryptEngine::WantEncryptKey | KviCryptEngine::WantDecryptKey;
d->m_allocFunc = allocRijndael128HexEngine;
d->m_deallocFunc = deallocRijndaelCryptEngine;
m->registerCryptEngine(d);
@@ -732,8 +731,8 @@ static bool rijndael_module_init(KviModule * m)
d->m_szName = "Rijndael192Hex";
d->m_szAuthor = "Szymon Stefanek";
d->m_szDescription = QString(szFormat).arg(__tr2qs("hexadecimal")).arg(192);
- d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
- KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
+ d->m_iFlags = KviCryptEngine::CanEncrypt | KviCryptEngine::CanDecrypt |
+ KviCryptEngine::WantEncryptKey | KviCryptEngine::WantDecryptKey;
d->m_allocFunc = allocRijndael192HexEngine;
d->m_deallocFunc = deallocRijndaelCryptEngine;
m->registerCryptEngine(d);
@@ -742,8 +741,8 @@ static bool rijndael_module_init(KviModule * m)
d->m_szName = "Rijndael256Hex";
d->m_szAuthor = "Szymon Stefanek";
d->m_szDescription = QString(szFormat).arg(__tr2qs("hexadecimal")).arg(256);
- d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
- KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
+ d->m_iFlags = KviCryptEngine::CanEncrypt | KviCryptEngine::CanDecrypt |
+ KviCryptEngine::WantEncryptKey | KviCryptEngine::WantDecryptKey;
d->m_allocFunc = allocRijndael256HexEngine;
d->m_deallocFunc = deallocRijndaelCryptEngine;
m->registerCryptEngine(d);
@@ -752,8 +751,8 @@ static bool rijndael_module_init(KviModule * m)
d->m_szName = "Rijndael128Base64";
d->m_szAuthor = "Szymon Stefanek";
d->m_szDescription = QString(szFormat).arg(__tr2qs("base64")).arg(128);
- d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
- KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
+ d->m_iFlags = KviCryptEngine::CanEncrypt | KviCryptEngine::CanDecrypt |
+ KviCryptEngine::WantEncryptKey | KviCryptEngine::WantDecryptKey;
d->m_allocFunc = allocRijndael128Base64Engine;
d->m_deallocFunc = deallocRijndaelCryptEngine;
m->registerCryptEngine(d);
@@ -762,8 +761,8 @@ static bool rijndael_module_init(KviModule * m)
d->m_szName = "Rijndael192Base64";
d->m_szAuthor = "Szymon Stefanek";
d->m_szDescription = QString(szFormat).arg(__tr2qs("base64")).arg(192);
- d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
- KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
+ d->m_iFlags = KviCryptEngine::CanEncrypt | KviCryptEngine::CanDecrypt |
+ KviCryptEngine::WantEncryptKey | KviCryptEngine::WantDecryptKey;
d->m_allocFunc = allocRijndael192Base64Engine;
d->m_deallocFunc = deallocRijndaelCryptEngine;
m->registerCryptEngine(d);
@@ -772,8 +771,8 @@ static bool rijndael_module_init(KviModule * m)
d->m_szName = "Rijndael256Base64";
d->m_szAuthor = "Szymon Stefanek";
d->m_szDescription = QString(szFormat).arg(__tr2qs("base64")).arg(256);
- d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
- KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
+ d->m_iFlags = KviCryptEngine::CanEncrypt | KviCryptEngine::CanDecrypt |
+ KviCryptEngine::WantEncryptKey | KviCryptEngine::WantDecryptKey;
d->m_allocFunc = allocRijndael256Base64Engine;
d->m_deallocFunc = deallocRijndaelCryptEngine;
m->registerCryptEngine(d);
@@ -794,8 +793,8 @@ static bool rijndael_module_init(KviModule * m)
"This engine works in ECB mode by default:\n" \
"if you want to use CBC mode you must prefix\n" \
"your key(s) with \"cbc:\".\n");
- d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT | KVI_CRYPTENGINE_CAN_DECRYPT |
- KVI_CRYPTENGINE_WANT_ENCRYPT_KEY | KVI_CRYPTENGINE_WANT_DECRYPT_KEY;
+ d->m_iFlags = KviCryptEngine::CanEncrypt | KviCryptEngine::CanDecrypt |
+ KviCryptEngine::WantEncryptKey | KviCryptEngine::WantDecryptKey;
d->m_allocFunc = allocMircryptionEngine;
d->m_deallocFunc = deallocRijndaelCryptEngine;
m->registerCryptEngine(d);
diff --git a/src/modules/rijndael/libkvirijndael.h b/src/modules/rijndael/libkvirijndael.h
index 65fd50ea9..5845923af 100644
--- a/src/modules/rijndael/libkvirijndael.h
+++ b/src/modules/rijndael/libkvirijndael.h
@@ -26,6 +26,7 @@
//=============================================================================
#include "kvi_settings.h"
+#include "KviCString.h"
#ifdef COMPILE_CRYPT_SUPPORT
diff --git a/src/modules/rot13/libkvirot13.cpp b/src/modules/rot13/libkvirot13.cpp
index c8ed5dfbf..622c23616 100644
--- a/src/modules/rot13/libkvirot13.cpp
+++ b/src/modules/rot13/libkvirot13.cpp
@@ -122,7 +122,7 @@ static bool rot13_module_init(KviModule * m)
d->m_szName = "ROT13";
d->m_szAuthor = "Aeriana";
d->m_szDescription = __tr2qs("The simple Caesar-cypher encryption that replaces each letter with the one 13 places forward or back along the alphabet; it is used to enclose the text in a sealed wrapper that the reader must choose to open - e.g. for posting things that might offend some readers, or spoilers.");
- d->m_iFlags = KVI_CRYPTENGINE_CAN_ENCRYPT;
+ d->m_iFlags = KviCryptEngine::CanEncrypt;
d->m_allocFunc = allocRot13Engine;
d->m_deallocFunc = deallocRot13Engine;
m->registerCryptEngine(d);