mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-12-04 15:39:34 +01:00
811887e591
Fixes #5290 Fixes #9062 Fixes #8545 * Fix data loss on failed reload - External modifications to the db file can no longer be missed. - Fixed dialogFinished signal of DatabaseOpenDialog was not emitted when dialog was closed via the 'X' (close) button - For reloading with a modified db, an additional choice has been added to allow the user to ignore the changes in the file on disk. - User is now presented with an unlock database dialog if reload fails to open the db automatically. For example when the user removed the YubiKey, failed to touch the YubiKey within the timeout period, or db pw has been changed. - Mark db as modified when db file is gone or invalid. - Prevent saving when db is being reloaded - If merge is triggered by a save action, continue on with the save action after the user makes their choice --------- Co-authored-by: vuurvlieg <vuurvli3g@protonmail.com> Co-authored-by: Jonathan White <support@dmapps.us>
52 lines
1.5 KiB
C++
52 lines
1.5 KiB
C++
/*
|
|
* Copyright (C) 2024 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
|
|
* 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_HASHINGSTREAM_H
|
|
#define KEEPASSX_HASHINGSTREAM_H
|
|
|
|
#include <QCryptographicHash>
|
|
|
|
#include "streams/LayeredStream.h"
|
|
|
|
class HashingStream : public LayeredStream
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit HashingStream(QIODevice* baseDevice);
|
|
HashingStream(QIODevice* baseDevice, QCryptographicHash::Algorithm hashAlgo, qint64 sizeToHash);
|
|
~HashingStream() override;
|
|
|
|
bool reset() override;
|
|
|
|
QByteArray hashingResult();
|
|
|
|
protected:
|
|
void init();
|
|
|
|
qint64 readData(char* data, qint64 maxSize) override;
|
|
qint64 writeData(const char* data, qint64 maxSize) override;
|
|
|
|
protected:
|
|
QCryptographicHash m_hash;
|
|
bool m_hashFinalized;
|
|
qint64 m_sizeToHash;
|
|
qint64 m_sizeHashed;
|
|
qint64 m_sizeStreamed;
|
|
};
|
|
|
|
#endif // KEEPASSX_HASHINGSTREAM_H
|