Merge branch 'master' into develop

This commit is contained in:
Jonathan White 2017-12-11 21:10:25 -05:00
commit 28ad6ed552
24 changed files with 254 additions and 264 deletions

View file

@ -202,7 +202,7 @@ void TestSymmetricCipher::testTwofish256CbcEncryption()
bool ok;
for (int i = 0; i < keys.size(); ++i) {
cipher.init(keys[i], ivs[i]);
QVERIFY(cipher.init(keys[i], ivs[i]));
QByteArray ptNext = plainTexts[i];
QByteArray ctPrev = ivs[i];
QByteArray ctCur;