padding tests

This commit is contained in:
Matteo Brichese 2018-03-28 17:47:20 -07:00
parent 1809de722f
commit f94a6339de
4 changed files with 48 additions and 49 deletions

View File

@ -85,8 +85,7 @@ QByteArray QAESEncryption::getPadding(int currSize, int alignment)
{ {
QByteArray ret(0); QByteArray ret(0);
int size = (alignment - currSize % alignment) % alignment; int size = (alignment - currSize % alignment) % alignment;
// if (size == 0) if (size == 0) return ret;
// size = alignment;
switch(m_padding) switch(m_padding)
{ {
case PADDING::ZERO: case PADDING::ZERO:

View File

@ -29,9 +29,9 @@ public:
static QByteArray Crypt(QAESEncryption::AES level, QAESEncryption::MODE mode, const QByteArray &rawText, const QByteArray &key, const QByteArray &iv = NULL); static QByteArray Crypt(QAESEncryption::AES level, QAESEncryption::MODE mode, const QByteArray &rawText, const QByteArray &key, const QByteArray &iv = NULL);
static QByteArray Decrypt(QAESEncryption::AES level, QAESEncryption::MODE mode, const QByteArray &rawText, const QByteArray &key, const QByteArray &iv = NULL); static QByteArray Decrypt(QAESEncryption::AES level, QAESEncryption::MODE mode, const QByteArray &rawText, const QByteArray &key, const QByteArray &iv = NULL);
static QByteArray ExpandKey(QAESEncryption::AES level, QAESEncryption::MODE mode, const QByteArray &key); static QByteArray ExpandKey(QAESEncryption::AES level, QAESEncryption::MODE mode, const QByteArray &key);
static QByteArray RemovePadding(const QByteArray &rawText, QAESEncryption::PADDING padding = PADDING::ZERO); static QByteArray RemovePadding(const QByteArray &rawText, QAESEncryption::PADDING padding = PADDING::ISO);
QAESEncryption(QAESEncryption::AES level, QAESEncryption::MODE mode, QAESEncryption::PADDING padding = QAESEncryption::ZERO); QAESEncryption(QAESEncryption::AES level, QAESEncryption::MODE mode, QAESEncryption::PADDING padding = QAESEncryption::ISO);
QByteArray encode(const QByteArray &rawText, const QByteArray &key, const QByteArray &iv = NULL); QByteArray encode(const QByteArray &rawText, const QByteArray &key, const QByteArray &iv = NULL);
QByteArray decode(const QByteArray &rawText, const QByteArray &key, const QByteArray &iv = NULL); QByteArray decode(const QByteArray &rawText, const QByteArray &key, const QByteArray &iv = NULL);

View File

@ -62,43 +62,43 @@ void AesTest::ECB128Crypt()
QCOMPARE(encryption.encode(in, key16), outECB128); QCOMPARE(encryption.encode(in, key16), outECB128);
} }
//void AesTest::ECB128Decrypt() void AesTest::ECB128Decrypt()
//{ {
// QByteArray hexText, outputHex; QByteArray hexText, outputHex;
// QAESEncryption encryption(QAESEncryption::AES_128, QAESEncryption::ECB); QAESEncryption encryption(QAESEncryption::AES_128, QAESEncryption::ECB);
// QCOMPARE(QAESEncryption::RemovePadding(encryption.decode(outECB128, key16)), in); QCOMPARE(encryption.decode(outECB128, key16), in);
//} }
//void AesTest::ECB192Crypt() void AesTest::ECB192Crypt()
//{ {
// QByteArray outputHex; QByteArray outputHex;
// QAESEncryption encryption(QAESEncryption::AES_192, QAESEncryption::ECB); QAESEncryption encryption(QAESEncryption::AES_192, QAESEncryption::ECB);
// QCOMPARE(QAESEncryption::RemovePadding(encryption.encode(in, key24)), outECB192); QCOMPARE(encryption.encode(in, key24), outECB192);
//} }
//void AesTest::ECB192Decrypt() void AesTest::ECB192Decrypt()
//{ {
// QByteArray hexText; QByteArray hexText;
// QAESEncryption encryption(QAESEncryption::AES_192, QAESEncryption::ECB); QAESEncryption encryption(QAESEncryption::AES_192, QAESEncryption::ECB);
// QCOMPARE(QAESEncryption::RemovePadding(encryption.decode(outECB192, key24)), in); QCOMPARE(encryption.decode(outECB192, key24), in);
//} }
//void AesTest::ECB256Crypt() void AesTest::ECB256Crypt()
//{ {
// QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB); QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB);
// QCOMPARE(QAESEncryption::RemovePadding(encryption.encode(in, key32)), outECB256); QCOMPARE(encryption.encode(in, key32), outECB256);
//} }
//void AesTest::ECB256Decrypt() void AesTest::ECB256Decrypt()
//{ {
// QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB); QAESEncryption encryption(QAESEncryption::AES_256, QAESEncryption::ECB);
// QCOMPARE(QAESEncryption::RemovePadding(encryption.decode(outECB256, key32)), in); QCOMPARE(encryption.decode(outECB256, key32), in);
//} }
void AesTest::ECB256String() void AesTest::ECB256String()
{ {
@ -120,19 +120,19 @@ void AesTest::ECB256String()
////==================CBC TESTING========================= ////==================CBC TESTING=========================
//void AesTest::CBC128Crypt() void AesTest::CBC128Crypt()
//{ {
// QAESEncryption encryption(QAESEncryption::AES_128, QAESEncryption::CBC); QAESEncryption encryption(QAESEncryption::AES_128, QAESEncryption::CBC);
// QCOMPARE(QAESEncryption::RemovePadding(encryption.encode(inCBC128, key16, iv)), outCBC128); QCOMPARE(encryption.encode(inCBC128, key16, iv), outCBC128);
//} }
//void AesTest::CBC128Decrypt() void AesTest::CBC128Decrypt()
//{ {
// QAESEncryption encryption(QAESEncryption::AES_128, QAESEncryption::CBC); QAESEncryption encryption(QAESEncryption::AES_128, QAESEncryption::CBC);
// QCOMPARE(QString(QAESEncryption::RemovePadding(encryption.decode(outCBC128, key16, iv))), inCBC128); QCOMPARE(encryption.decode(outCBC128, key16, iv), inCBC128);
//} }
//=================== CFB TESTING ============================ //=================== CFB TESTING ============================

View File

@ -12,18 +12,18 @@ private slots:
void initTestCase(); void initTestCase();
void ECB128Crypt(); void ECB128Crypt();
// void ECB128Decrypt(); void ECB128Decrypt();
// void ECB192Crypt(); void ECB192Crypt();
// void ECB192Decrypt(); void ECB192Decrypt();
// void ECB256Crypt(); void ECB256Crypt();
// void ECB256Decrypt(); void ECB256Decrypt();
void ECB256String(); void ECB256String();
// void CBC128Crypt(); void CBC128Crypt();
// void CBC128Decrypt(); void CBC128Decrypt();
void CFB256String(); void CFB256String();