Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-25 15:55:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixed issues with initial commit

Browse source
This commit is contained in:
pasdam 2018-03-23 11:18:06 +01:00 • committed by Jonathan White
parent ad4423d226
commit b4d806ad41
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
17 changed files with 43 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/format/KdbxReader.cpp
View file

@ -19,7 +19,7 @@
#include "core/Database.h"
#include "core/Endian.h"
#define UUID_LENGHT 16
#define UUID_LENGTH 16
/**
* Read KDBX magic header numbers from a device.
@ -135,7 +135,7 @@ KeePass2::ProtectedStreamAlgo KdbxReader::protectedStreamAlgo() const
*/
void KdbxReader::setCipher(const QByteArray& data)
{
if (data.size() != UUID_LENGHT) {
if (data.size() != UUID_LENGTH) {
raiseError(tr("Invalid cipher uuid length: %1 (length=%2)").arg(QString(data)).arg(data.size()));
return;
}

4
src/format/KdbxXmlReader.cpp
View file

@ -28,7 +28,7 @@
#include <QBuffer>
#include <QFile>
#define UUID_LENGHT 16
#define UUID_LENGTH 16
/**
* @param version KDBX version
@ -1099,7 +1099,7 @@ QUuid KdbxXmlReader::readUuid()
if (uuidBin.isEmpty()) {
return QUuid();
}
if (uuidBin.length() != UUID_LENGHT) {
if (uuidBin.length() != UUID_LENGTH) {
if (m_strictMode) {
raiseError(tr("Invalid uuid value"));
}

4
src/format/KeePass2.cpp
View file

@ -21,7 +21,7 @@
#include "crypto/kdf/Argon2Kdf.h"
#include <QSharedPointer>
#define UUID_LENGHT 16
#define UUID_LENGTH 16
const QUuid KeePass2::CIPHER_AES = QUuid::fromRfc4122(QByteArray::fromHex("31c1f2e6bf714350be5805216afc5aff"));
const QUuid KeePass2::CIPHER_TWOFISH = QUuid::fromRfc4122(QByteArray::fromHex("ad68f29f576f4bb9a36ad47af965346c"));
@ -76,7 +76,7 @@ QByteArray KeePass2::hmacKey(QByteArray masterSeed, QByteArray transformedMaster
QSharedPointer<Kdf> KeePass2::kdfFromParameters(const QVariantMap& p)
{
QByteArray uuidBytes = p.value(KDFPARAM_UUID).toByteArray();
if (uuidBytes.size() != UUID_LENGHT) {
if (uuidBytes.size() != UUID_LENGTH) {
return {};
}