aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kvilib/ext/KviCryptEngine.h10
-rw-r--r--src/kvilib/ext/KviCryptEngineDescription.h4
-rw-r--r--src/modules/lamerizer/libkvilamerizer.h8
-rw-r--r--src/modules/rijndael/libkvirijndael.h83
-rw-r--r--src/modules/rot13/libkvirot13.h8
5 files changed, 56 insertions, 57 deletions
diff --git a/src/kvilib/ext/KviCryptEngine.h b/src/kvilib/ext/KviCryptEngine.h
index 72a8da808..6539cf1b5 100644
--- a/src/kvilib/ext/KviCryptEngine.h
+++ b/src/kvilib/ext/KviCryptEngine.h
@@ -89,8 +89,8 @@ private:
int m_iMaxEncryptLen;
public:
- void setMaxEncryptLen(int m) { m_iMaxEncryptLen = m; };
- int maxEncryptLen() { return m_iMaxEncryptLen; };
+ void setMaxEncryptLen(int m) { m_iMaxEncryptLen = m; }
+ int maxEncryptLen() const { return m_iMaxEncryptLen; }
virtual bool init(const char * encKey, int encKeyLen, const char * decKey, int decKeyLen);
//
// Encrypts utf8 plainText and returns the encrypted
@@ -120,13 +120,13 @@ public:
// of the last error or an empty string if there
// was no error after the last init() call.
//
- const QString & lastError() { return m_szLastError; };
+ const QString & lastError() const { return m_szLastError; }
protected:
//
// The following two should have clear meaning
//
- void clearLastError() { m_szLastError = ""; };
- void setLastError(const QString & err) { m_szLastError = err; };
+ void clearLastError() { m_szLastError = ""; }
+ void setLastError(const QString & err) { m_szLastError = err; }
#endif //COMPILE_CRYPT_SUPPORT
};
diff --git a/src/kvilib/ext/KviCryptEngineDescription.h b/src/kvilib/ext/KviCryptEngineDescription.h
index 524e1d311..8347b20e6 100644
--- a/src/kvilib/ext/KviCryptEngineDescription.h
+++ b/src/kvilib/ext/KviCryptEngineDescription.h
@@ -40,8 +40,8 @@
class KVILIB_API KviCryptEngineDescription : public KviHeapObject
{
public:
- KviCryptEngineDescription(){};
- virtual ~KviCryptEngineDescription(){};
+ KviCryptEngineDescription(){}
+ virtual ~KviCryptEngineDescription(){}
public:
QString m_szName; /**< engine name */
diff --git a/src/modules/lamerizer/libkvilamerizer.h b/src/modules/lamerizer/libkvilamerizer.h
index 7ac35fd0a..a86867cc8 100644
--- a/src/modules/lamerizer/libkvilamerizer.h
+++ b/src/modules/lamerizer/libkvilamerizer.h
@@ -36,15 +36,15 @@ class KviLamerizerEngine : public KviCryptEngine
Q_OBJECT
public:
KviLamerizerEngine(bool bLight);
- ~KviLamerizerEngine();
+ virtual ~KviLamerizerEngine();
protected:
bool m_bLight;
public:
- virtual bool init(const char * encKey, int encKeyLen, const char * decKey, int decKeyLen);
- virtual KviCryptEngine::EncryptResult encrypt(const char * plainText, KviCString & outBuffer);
- virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer, KviCString & plainText);
+ bool init(const char * encKey, int encKeyLen, const char * decKey, int decKeyLen) override;
+ KviCryptEngine::EncryptResult encrypt(const char * plainText, KviCString & outBuffer) override;
+ KviCryptEngine::DecryptResult decrypt(const char * inBuffer, KviCString & plainText) override;
};
#endif // COMPILE_CRYPT_SUPPORT
diff --git a/src/modules/rijndael/libkvirijndael.h b/src/modules/rijndael/libkvirijndael.h
index ba5f3f2c4..ef54e7ec6 100644
--- a/src/modules/rijndael/libkvirijndael.h
+++ b/src/modules/rijndael/libkvirijndael.h
@@ -53,15 +53,15 @@ private:
OperationalMode m_bDecryptMode;
public:
- virtual bool init(const char * encKey, int encKeyLen, const char * decKey, int decKeyLen);
- virtual KviCryptEngine::EncryptResult encrypt(const char * plainText, KviCString & outBuffer);
- virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer, KviCString & plainText);
+ bool init(const char * encKey, int encKeyLen, const char * decKey, int decKeyLen) override;
+ KviCryptEngine::EncryptResult encrypt(const char * plainText, KviCString & outBuffer) override;
+ KviCryptEngine::DecryptResult decrypt(const char * inBuffer, KviCString & plainText) override;
protected:
- virtual bool binaryToAscii(const char *, int, KviCString &) { return false; };
- virtual bool asciiToBinary(const char *, int *, char **) { return false; };
- virtual int getKeyLen() { return 32; };
- virtual Rijndael::KeyLength getKeyLenId() { return Rijndael::Key32Bytes; };
+ virtual bool binaryToAscii(const char *, int, KviCString &) { return false; }
+ virtual bool asciiToBinary(const char *, int *, char **) { return false; }
+ virtual int getKeyLen() const { return 32; }
+ virtual Rijndael::KeyLength getKeyLenId() const { return Rijndael::Key32Bytes; }
private:
void setLastErrorFromRijndaelErrorCode(int errCode);
};
@@ -70,94 +70,94 @@ class KviRijndaelHexEngine : public KviRijndaelEngine
{
Q_OBJECT
public:
- KviRijndaelHexEngine() : KviRijndaelEngine(){};
- virtual ~KviRijndaelHexEngine(){};
+ KviRijndaelHexEngine() : KviRijndaelEngine(){}
+ virtual ~KviRijndaelHexEngine(){}
protected:
- virtual bool binaryToAscii(const char * inBuffer, int len, KviCString & outBuffer);
- virtual bool asciiToBinary(const char * inBuffer, int * len, char ** outBuffer);
+ bool binaryToAscii(const char * inBuffer, int len, KviCString & outBuffer) override;
+ bool asciiToBinary(const char * inBuffer, int * len, char ** outBuffer) override;
};
class KviRijndael128HexEngine : public KviRijndaelHexEngine
{
Q_OBJECT
public:
- KviRijndael128HexEngine() : KviRijndaelHexEngine(){};
- virtual ~KviRijndael128HexEngine(){};
+ KviRijndael128HexEngine() : KviRijndaelHexEngine(){}
+ virtual ~KviRijndael128HexEngine(){}
protected:
- virtual int getKenLen() { return 16; };
- virtual Rijndael::KeyLength getKeyLenId() { return Rijndael::Key16Bytes; };
+ int getKeyLen() const override { return 16; }
+ Rijndael::KeyLength getKeyLenId() const override { return Rijndael::Key16Bytes; }
};
class KviRijndael192HexEngine : public KviRijndaelHexEngine
{
Q_OBJECT
public:
- KviRijndael192HexEngine() : KviRijndaelHexEngine(){};
- virtual ~KviRijndael192HexEngine(){};
+ KviRijndael192HexEngine() : KviRijndaelHexEngine(){}
+ virtual ~KviRijndael192HexEngine(){}
protected:
- virtual int getKenLen() { return 24; };
- virtual Rijndael::KeyLength getKeyLenId() { return Rijndael::Key24Bytes; };
+ int getKeyLen() const override { return 24; }
+ Rijndael::KeyLength getKeyLenId() const override { return Rijndael::Key24Bytes; }
};
class KviRijndael256HexEngine : public KviRijndaelHexEngine
{
Q_OBJECT
public:
- KviRijndael256HexEngine() : KviRijndaelHexEngine(){};
- virtual ~KviRijndael256HexEngine(){};
+ KviRijndael256HexEngine() : KviRijndaelHexEngine(){}
+ virtual ~KviRijndael256HexEngine(){}
protected:
- virtual int getKenLen() { return 32; };
+ int getKeyLen() const override { return 32; }
};
class KviRijndaelBase64Engine : public KviRijndaelEngine
{
Q_OBJECT
public:
- KviRijndaelBase64Engine() : KviRijndaelEngine(){};
- virtual ~KviRijndaelBase64Engine(){};
+ KviRijndaelBase64Engine() : KviRijndaelEngine(){}
+ virtual ~KviRijndaelBase64Engine(){}
protected:
- virtual bool binaryToAscii(const char * inBuffer, int len, KviCString & outBuffer);
- virtual bool asciiToBinary(const char * inBuffer, int * len, char ** outBuffer);
+ bool binaryToAscii(const char * inBuffer, int len, KviCString & outBuffer) override;
+ bool asciiToBinary(const char * inBuffer, int * len, char ** outBuffer) override;
};
class KviRijndael128Base64Engine : public KviRijndaelBase64Engine
{
Q_OBJECT
public:
- KviRijndael128Base64Engine() : KviRijndaelBase64Engine(){};
- virtual ~KviRijndael128Base64Engine(){};
+ KviRijndael128Base64Engine() : KviRijndaelBase64Engine(){}
+ virtual ~KviRijndael128Base64Engine(){}
protected:
- virtual int getKenLen() { return 16; };
- virtual Rijndael::KeyLength getKeyLenId() { return Rijndael::Key16Bytes; };
+ int getKeyLen() const override { return 16; }
+ Rijndael::KeyLength getKeyLenId() const override { return Rijndael::Key16Bytes; }
};
class KviRijndael192Base64Engine : public KviRijndaelBase64Engine
{
Q_OBJECT
public:
- KviRijndael192Base64Engine() : KviRijndaelBase64Engine(){};
- virtual ~KviRijndael192Base64Engine(){};
+ KviRijndael192Base64Engine() : KviRijndaelBase64Engine(){}
+ virtual ~KviRijndael192Base64Engine(){}
protected:
- virtual int getKenLen() { return 24; };
- virtual Rijndael::KeyLength getKeyLenId() { return Rijndael::Key24Bytes; };
+ int getKeyLen() const override { return 24; }
+ Rijndael::KeyLength getKeyLenId() const override { return Rijndael::Key24Bytes; }
};
class KviRijndael256Base64Engine : public KviRijndaelBase64Engine
{
Q_OBJECT
public:
- KviRijndael256Base64Engine() : KviRijndaelBase64Engine(){};
- virtual ~KviRijndael256Base64Engine(){};
+ KviRijndael256Base64Engine() : KviRijndaelBase64Engine(){}
+ virtual ~KviRijndael256Base64Engine(){}
protected:
- virtual int getKenLen() { return 32; };
+ int getKeyLen() const override { return 32; }
};
// Mircyption stuff
@@ -169,7 +169,7 @@ class KviMircryptionEngine : public KviCryptEngine
Q_OBJECT
public:
KviMircryptionEngine();
- ~KviMircryptionEngine();
+ virtual ~KviMircryptionEngine();
protected:
KviCString m_szEncryptKey;
@@ -178,10 +178,9 @@ protected:
bool m_bDecryptCBC;
public:
- virtual bool isCryptographicEngine() { return false; }; // we need to return false since it doesn't use the Qt::CTRL+P escape
- virtual bool init(const char * encKey, int encKeyLen, const char * decKey, int decKeyLen);
- virtual KviCryptEngine::EncryptResult encrypt(const char * plainText, KviCString & outBuffer);
- virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer, KviCString & plainText);
+ bool init(const char * encKey, int encKeyLen, const char * decKey, int decKeyLen) override;
+ KviCryptEngine::EncryptResult encrypt(const char * plainText, KviCString & outBuffer) override;
+ KviCryptEngine::DecryptResult decrypt(const char * inBuffer, KviCString & plainText) override;
protected:
bool doDecryptECB(KviCString & encoded, KviCString & plain);
diff --git a/src/modules/rot13/libkvirot13.h b/src/modules/rot13/libkvirot13.h
index b64dfaa65..ee16fd864 100644
--- a/src/modules/rot13/libkvirot13.h
+++ b/src/modules/rot13/libkvirot13.h
@@ -36,12 +36,12 @@ class KviRot13Engine : public KviCryptEngine
Q_OBJECT
public:
KviRot13Engine();
- ~KviRot13Engine();
+ virtual ~KviRot13Engine();
public:
- virtual bool init(const char * encKey, int encKeyLen, const char * decKey, int decKeyLen);
- virtual KviCryptEngine::EncryptResult encrypt(const char * plainText, KviCString & outBuffer);
- virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer, KviCString & plainText);
+ bool init(const char * encKey, int encKeyLen, const char * decKey, int decKeyLen) override;
+ KviCryptEngine::EncryptResult encrypt(const char * plainText, KviCString & outBuffer) override;
+ KviCryptEngine::DecryptResult decrypt(const char * inBuffer, KviCString & plainText) override;
};
#endif // COMPILE_CRYPT_SUPPORT
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 13:04:04 +0000