rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reformat code, fix minor style issues, make kdf() getter const

Browse Source
This commit is contained in:
Janek Bevendorff
2017-12-16 17:36:33 +01:00
committed by Jonathan White
parent d1a19a1009
commit 0d6ca0945b
24 changed files with 324 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/streams/HmacBlockStream.cpp
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017 KeePassXC Team
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
*
* 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
@@ -24,7 +24,7 @@ const QSysInfo::Endian HmacBlockStream::ByteOrder = QSysInfo::LittleEndian;
HmacBlockStream::HmacBlockStream(QIODevice* baseDevice, QByteArray key)
: LayeredStream(baseDevice)
, m_blockSize(1024*1024)
, m_blockSize(1024 * 1024)
, m_key(key)
{
init();
@@ -94,8 +94,7 @@ qint64 HmacBlockStream::readData(char* data, qint64 maxSize)
{
if (m_error) {
return -1;
}
else if (m_eof) {
} else if (m_eof) {
return 0;
}
@@ -107,8 +106,7 @@ qint64 HmacBlockStream::readData(char* data, qint64 maxSize)
if (!readHashedBlock()) {
if (m_error) {
return -1;
}
else {
} else {
return maxSize - bytesRemaining;
}
}
@@ -204,8 +202,7 @@ qint64 HmacBlockStream::writeData(const char* data, qint64 maxSize)
if (!writeHashedBlock()) {
if (m_error) {
return -1;
}
else {
} else {
return maxSize - bytesRemaining;
}
}
@@ -249,11 +246,13 @@ bool HmacBlockStream::writeHashedBlock()
return true;
}
QByteArray HmacBlockStream::getCurrentHmacKey() const {
QByteArray HmacBlockStream::getCurrentHmacKey() const
{
return getHmacKey(m_blockIndex, m_key);
}
QByteArray HmacBlockStream::getHmacKey(quint64 blockIndex, QByteArray key) {
QByteArray HmacBlockStream::getHmacKey(quint64 blockIndex, QByteArray key)
{
Q_ASSERT(key.size() == 64);
QByteArray indexBytes = Endian::sizedIntToBytes<quint64>(blockIndex, ByteOrder);
CryptoHash hasher(CryptoHash::Sha512);
@@ -262,6 +261,7 @@ QByteArray HmacBlockStream::getHmacKey(quint64 blockIndex, QByteArray key) {
return hasher.result();
}
bool HmacBlockStream::atEnd() const {
bool HmacBlockStream::atEnd() const
{
return m_eof;
}

6
src/streams/HmacBlockStream.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017 KeePassXC Team
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
*
* 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
@@ -22,9 +22,9 @@
#include "streams/LayeredStream.h"
class HmacBlockStream : public LayeredStream
class HmacBlockStream: public LayeredStream
{
Q_OBJECT
Q_OBJECT
public:
explicit HmacBlockStream(QIODevice* baseDevice, QByteArray key);