mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-03-11 08:54:48 +00:00
Fix warning C4244 'argument': conversion from 'size_t' to 'int', possible loss of data
Use explicit cast. Signed-off-by: Sven Strickroth <email@cs-ware.de>
This commit is contained in:
parent
592d553ff8
commit
bba7700f19
2 changed files with 4 additions and 4 deletions
|
|
@ -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(".");
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue