QuasarApp/Qt-AES
4
0
Fork 0
mirror of https://github.com/QuasarApp/Qt-AES.git synced 2025-05-07 18:59:34 +00:00
Code Issues Projects Releases Wiki Activity

removing insert to fix compatibility with Qt5.6

Browse Source
This commit is contained in:
Matteo Brichese 2018-04-04 11:41:41 -07:00
parent 6fc1d88485
commit 95104a6ef9
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qaesencryption.cpp
View File

@ -109,26 +109,24 @@ QAESEncryption::QAESEncryption(Aes level, Mode mode,
} }
QByteArray QAESEncryption::getPadding(int currSize, int alignment) QByteArray QAESEncryption::getPadding(int currSize, int alignment)
{ {
QByteArray ret(0);
int size = (alignment - currSize % alignment) % alignment; int size = (alignment - currSize % alignment) % alignment;
if (size == 0) return ret; if (size == 0) return QByteArray();
switch(m_padding) switch(m_padding)
{ {
case Padding::ZERO: case Padding::ZERO:
ret.insert(0, size, 0x00); return QByteArray(size, 0x00);
break; break;
case Padding::PKCS7: case Padding::PKCS7:
ret.insert(0, size, size); return QByteArray(size,size);
break; break;
case Padding::ISO: case Padding::ISO:
ret.insert(0, 0x80); return QByteArray (size-1, 0x00).prepend(0x80);
ret.insert(1, size, 0x00);
break; break;
default: default:
ret.insert(0, size, 0x00); return QByteArray(size, 0x00);
break; break;
} }
return ret; return QByteArray(size, 0x00);
} }
QByteArray QAESEncryption::expandKey(const QByteArray &key) QByteArray QAESEncryption::expandKey(const QByteArray &key)