Add support for database format 3.01 (HeaderHash).

Add test for the format 3.00 and upgrade Compressed.kdbx, NonAscii.kdbx
and ProtectedStrings.kdbx to 3.01.

Add a test for an incorrect HeaderHash.
This commit is contained in:
Felix Geyer 2012-09-25 22:33:36 +02:00
parent 40ccd219f4
commit 18d3fe55f8
18 changed files with 185 additions and 16 deletions

View file

@ -0,0 +1,48 @@
/*
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
*
* 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
* the Free Software Foundation, either version 2 or (at your option)
* version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "StoreDataStream.h"
StoreDataStream::StoreDataStream(QIODevice* baseDevice)
: LayeredStream(baseDevice)
{
}
bool StoreDataStream::open(QIODevice::OpenMode mode)
{
bool result = LayeredStream::open(mode);
if (result) {
m_storedData.clear();
}
return result;
}
QByteArray StoreDataStream::storedData() const
{
return m_storedData;
}
qint64 StoreDataStream::readData(char* data, qint64 maxSize)
{
qint64 bytesRead = LayeredStream::readData(data, maxSize);
m_storedData.append(data, bytesRead);
return bytesRead;
}

View file

@ -0,0 +1,39 @@
/*
* Copyright (C) 2012 Felix Geyer <debfx@fobos.de>
*
* 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
* the Free Software Foundation, either version 2 or (at your option)
* version 3 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KEEPASSX_STOREDATASTREAM_H
#define KEEPASSX_STOREDATASTREAM_H
#include "streams/LayeredStream.h"
class StoreDataStream : public LayeredStream
{
Q_OBJECT
public:
explicit StoreDataStream(QIODevice* baseDevice);
bool open(QIODevice::OpenMode mode) Q_DECL_OVERRIDE;
QByteArray storedData() const;
protected:
qint64 readData(char* data, qint64 maxSize) Q_DECL_OVERRIDE;
private:
QByteArray m_storedData;
};
#endif // KEEPASSX_STOREDATASTREAM_H