mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-10-01 01:26:01 -04:00
80809ace67
Selected the [Botan crypto library](https://github.com/randombit/botan) due to its feature list, maintainer support, availability across all deployment platforms, and ease of use. Also evaluated Crypto++ as a viable candidate, but the additional features of Botan (PKCS#11, TPM, etc) won out. The random number generator received a backend upgrade. Botan prefers hardware-based RNG's and will provide one if available. This is transparent to KeePassXC and a significant improvement over gcrypt. Replaced Argon2 library with built-in Botan implementation that supports i, d, and id. This requires Botan 2.11.0 or higher. Also simplified the parameter test across KDF's. Aligned SymmetricCipher parameters with available modes. All encrypt and decrypt operations are done in-place instead of returning new objects. This allows use of secure vectors in the future with no additional overhead. Took this opportunity to decouple KeeShare from SSH Agent. Removed leftover code from OpenSSHKey and consolidated the SSH Agent code into the same directory. Removed bcrypt and blowfish inserts since they are provided by Botan. Additionally simplified KeeShare settings interface by removing raw certificate byte data from the user interface. KeeShare will be further refactored in a future PR. NOTE: This PR breaks backwards compatibility with KeeShare certificates due to different RSA key storage with Botan. As a result, new "own" certificates will need to be generated and trust re-established. Removed YKChallengeResponseKeyCLI in favor of just using the original implementation with signal/slots. Removed TestRandom stub since it was just faking random numbers and not actually using the backend. TestRandomGenerator now uses the actual RNG. Greatly simplified Secret Service plugin's use of crypto functions with Botan.
88 lines
3.2 KiB
C++
88 lines
3.2 KiB
C++
/*
|
|
* Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 or (at your option)
|
|
* version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "TestKeePass2RandomStream.h"
|
|
#include "TestGlobal.h"
|
|
|
|
#include "crypto/Crypto.h"
|
|
#include "crypto/CryptoHash.h"
|
|
#include "crypto/SymmetricCipher.h"
|
|
#include "format/KeePass2RandomStream.h"
|
|
|
|
QTEST_GUILESS_MAIN(TestKeePass2RandomStream)
|
|
|
|
void TestKeePass2RandomStream::initTestCase()
|
|
{
|
|
QVERIFY(Crypto::init());
|
|
}
|
|
|
|
void TestKeePass2RandomStream::test()
|
|
{
|
|
const QByteArray key("\x11\x22\x33\x44\x55\x66\x77\x88");
|
|
const int Size = 128;
|
|
|
|
SymmetricCipher cipher;
|
|
QVERIFY(cipher.init(SymmetricCipher::Salsa20,
|
|
SymmetricCipher::Encrypt,
|
|
CryptoHash::hash(key, CryptoHash::Sha256),
|
|
KeePass2::INNER_STREAM_SALSA20_IV));
|
|
|
|
const QByteArray data(QByteArray::fromHex("601ec313775789a5b7a7f504bbf3d228f443e3ca4d62b59aca84e990cacaf5c5"
|
|
"2b0930daa23de94ce87017ba2d84988ddfc9c58db67aada613c2dd08457941a6"
|
|
"1abc932417521ca24f2b0459fe7e6e0b090339ec0aa6faefd5ccc2c6f4ce8e94"
|
|
"1e36b26bd1ebc670d1bd1d665620abf74f78a7f6d29809585a97daec58c6b050"));
|
|
|
|
QByteArray cipherPad;
|
|
cipherPad.fill('\0', Size);
|
|
QVERIFY(cipher.process(cipherPad));
|
|
|
|
QByteArray cipherData;
|
|
cipherData.resize(Size);
|
|
|
|
for (int i = 0; i < Size; i++) {
|
|
cipherData[i] = data[i] ^ cipherPad[i];
|
|
}
|
|
|
|
KeePass2RandomStream randomStream;
|
|
bool ok;
|
|
QVERIFY(randomStream.init(SymmetricCipher::Salsa20, key));
|
|
QByteArray randomStreamData;
|
|
randomStreamData.append(randomStream.process(data.mid(0, 7), &ok));
|
|
QVERIFY(ok);
|
|
randomStreamData.append(randomStream.process(data.mid(7, 1), &ok));
|
|
QVERIFY(ok);
|
|
QByteArray tmpData = data.mid(8, 12);
|
|
QVERIFY(randomStream.processInPlace(tmpData));
|
|
randomStreamData.append(tmpData);
|
|
randomStreamData.append(randomStream.process(data.mid(20, 44), &ok));
|
|
QVERIFY(ok);
|
|
randomStreamData.append(randomStream.process(data.mid(64, 64), &ok));
|
|
QVERIFY(ok);
|
|
|
|
SymmetricCipher cipherEncrypt;
|
|
QVERIFY(cipherEncrypt.init(SymmetricCipher::Salsa20,
|
|
SymmetricCipher::Encrypt,
|
|
CryptoHash::hash(key, CryptoHash::Sha256),
|
|
KeePass2::INNER_STREAM_SALSA20_IV));
|
|
QByteArray cipherDataEncrypt = data;
|
|
QVERIFY(cipherEncrypt.process(cipherDataEncrypt));
|
|
|
|
QCOMPARE(randomStreamData.size(), Size);
|
|
QCOMPARE(cipherData, cipherDataEncrypt);
|
|
QCOMPARE(randomStreamData, cipherData);
|
|
}
|