mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-03-20 13:16:34 -04:00
13eb1c0bbd
To reduce residual fragments of secret data in memory after deallocation, this patch replaces the global delete operator with a version that zeros out previously allocated memory. It makes use of the new C++14 sized deallocation, but provides an unsized fallback with platform-specific size deductions. This change is only a minor mitigation and cannot protect against buffer reallocations by the operating system or non-C++ libraries. Thus, we still cannot guarantee all memory to be wiped after free. As a further improvement, this patch uses libgcrypt and libsodium to write long-lived master key component hashes into a secure memory area and wipe it afterwards. The patch also fixes compiler flags not being set properly on macOS.
66 lines
1.8 KiB
C++
66 lines
1.8 KiB
C++
/*
|
|
* Copyright (C) 2017 KeePassXC Team <team@keepassxc.org>
|
|
* Copyright (C) 2011 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_FILEKEY_H
|
|
#define KEEPASSX_FILEKEY_H
|
|
|
|
#include <QXmlStreamReader>
|
|
|
|
#include "keys/Key.h"
|
|
|
|
class QIODevice;
|
|
|
|
class FileKey : public Key
|
|
{
|
|
public:
|
|
static QUuid UUID;
|
|
|
|
enum Type
|
|
{
|
|
None,
|
|
Hashed,
|
|
KeePass2XML,
|
|
FixedBinary,
|
|
FixedBinaryHex
|
|
};
|
|
|
|
FileKey();
|
|
~FileKey() override;
|
|
bool load(QIODevice* device);
|
|
bool load(const QString& fileName, QString* errorMsg = nullptr);
|
|
QByteArray rawKey() const override;
|
|
Type type() const;
|
|
static void create(QIODevice* device, int size = 128);
|
|
static bool create(const QString& fileName, QString* errorMsg = nullptr, int size = 128);
|
|
|
|
private:
|
|
static constexpr int SHA256_SIZE = 32;
|
|
|
|
bool loadXml(QIODevice* device);
|
|
bool loadXmlMeta(QXmlStreamReader& xmlReader);
|
|
QByteArray loadXmlKey(QXmlStreamReader& xmlReader);
|
|
bool loadBinary(QIODevice* device);
|
|
bool loadHex(QIODevice* device);
|
|
bool loadHashed(QIODevice* device);
|
|
|
|
char* m_key = nullptr;
|
|
Type m_type = None;
|
|
};
|
|
|
|
#endif // KEEPASSX_FILEKEY_H
|