Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-25 05:14:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge 1b56a81bbe into 331a2de136

Browse source
This commit is contained in:
Sven Strickroth 2025-12-06 14:10:56 -05:00 • committed by GitHub
commit a3eb5a97b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/format/BitwardenReader.cpp
View file

@ -388,11 +388,11 @@ QSharedPointer<Database> BitwardenReader::convert(const QString& path, const QSt
// Derive the MAC Key
auto stretched_mac = hkdf->derive_key(32, reinterpret_cast<const uint8_t*>(key.data()), key.size(), "", "mac");
auto mac = QByteArray(reinterpret_cast<const char*>(stretched_mac.data()), stretched_mac.size());
auto mac = QByteArray(reinterpret_cast<const char*>(stretched_mac.data()), static_cast<int>(stretched_mac.size()));
// Stretch the Master Key
auto stretched_key = hkdf->derive_key(32, reinterpret_cast<const uint8_t*>(key.data()), key.size(), "", "enc");
key = QByteArray(reinterpret_cast<const char*>(stretched_key.data()), stretched_key.size());
key = QByteArray(reinterpret_cast<const char*>(stretched_key.data()), static_cast<int>(stretched_key.size()));
// Validate the encryption key
auto keyList = json.value("encKeyValidation_DO_NOT_EDIT").toString().split(".");

8
src/keeshare/KeeShareSettings.cpp
View file

@ -66,7 +66,7 @@ namespace KeeShareSettings
return;
}
auto berKey = Botan::PKCS8::BER_encode(*certificate.key);
auto baKey = QByteArray::fromRawData(reinterpret_cast<const char*>(berKey.data()), berKey.size());
auto baKey = QByteArray::fromRawData(reinterpret_cast<const char*>(berKey.data()), static_cast<int>(berKey.size()));
writer.writeStartElement("Signer");
writer.writeCharacters(certificate.signer);
@ -148,7 +148,7 @@ namespace KeeShareSettings
return;
}
auto berKey = Botan::PKCS8::BER_encode(*key.key);
auto baKey = QByteArray::fromRawData(reinterpret_cast<const char*>(berKey.data()), berKey.size());
auto baKey = QByteArray::fromRawData(reinterpret_cast<const char*>(berKey.data()), static_cast<int>(berKey.size()));
writer.writeCharacters(baKey.toBase64());
}
@ -388,8 +388,8 @@ namespace KeeShareSettings
QByteArray rsaKeySerialized;
QDataStream stream(&rsaKeySerialized, QIODevice::WriteOnly);
stream.writeBytes("ssh-rsa", 7);
stream.writeBytes(reinterpret_cast<const char*>(rsaE.data()), rsaE.size());
stream.writeBytes(reinterpret_cast<const char*>(rsaN.data()), rsaN.size());
stream.writeBytes(reinterpret_cast<const char*>(rsaE.data()), static_cast<uint>(rsaE.size()));
stream.writeBytes(reinterpret_cast<const char*>(rsaN.data()), static_cast<uint>(rsaN.size()));
return xmlSerialize([&](QXmlStreamWriter& writer) {
writer.writeStartElement("Signature");