QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-05-13 11:09:34 +00:00
Code Issues Projects Releases Wiki Activity

botan: Fix crash if asking for something botan doesn't provide

Browse Source 
Fixes crash in KDFUnitTest with my botan installation
This commit is contained in:
Albert Astals Cid 2020-01-19 22:32:32 +01:00
parent 1b061d63a8
commit b9d80939c6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/qca-botan/qca-botan.cpp
View File

@ -179,7 +179,12 @@ class BotanPBKDFContext: public QCA::KDFContext
public: public:
BotanPBKDFContext( const QString &kdfName, QCA::Provider *p, const QString &type) : QCA::KDFContext(p, type) BotanPBKDFContext( const QString &kdfName, QCA::Provider *p, const QString &type) : QCA::KDFContext(p, type)
{ {
m_s2k = Botan::get_s2k(kdfName.toStdString()); try {
m_s2k = Botan::get_s2k(kdfName.toStdString());
} catch (Botan::Exception& e) {
m_s2k = nullptr;
std::cout << "caught: " << e.what() << std::endl;
}
} }
~BotanPBKDFContext() ~BotanPBKDFContext()
@ -195,6 +200,9 @@ public:
QCA::SymmetricKey makeKey(const QCA::SecureArray &secret, const QCA::InitializationVector &salt, QCA::SymmetricKey makeKey(const QCA::SecureArray &secret, const QCA::InitializationVector &salt,
unsigned int keyLength, unsigned int iterationCount) override unsigned int keyLength, unsigned int iterationCount) override
{ {
if (!m_s2k)
return {};
std::string secretString(secret.data(), secret.size() ); std::string secretString(secret.data(), secret.size() );
Botan::OctetString key = m_s2k->derive_key(keyLength, secretString, (const Botan::byte*)salt.data(), salt.size(), iterationCount); Botan::OctetString key = m_s2k->derive_key(keyLength, secretString, (const Botan::byte*)salt.data(), salt.size(), iterationCount);
QCA::SecureArray retval(QByteArray((const char*)key.begin(), key.length())); QCA::SecureArray retval(QByteArray((const char*)key.begin(), key.length()));