Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-27 08:01:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

SSH Agent: Track which database owns a key for remove-on-lock

Browse source 
Fixes #4532
This commit is contained in:
Toni Spets 2020-04-04 09:00:49 +03:00 • committed by Jonathan White
parent 9e17d52e8e
commit a1b4a3f8b7
6 changed files with 60 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/sshagent/SSHAgent.h
View file

@ -47,9 +47,9 @@ public:
const QString errorString() const;
bool isAgentRunning() const;
bool addIdentity(OpenSSHKey& key, KeeAgentSettings& settings);
bool addIdentity(OpenSSHKey& key, const KeeAgentSettings& settings, const QUuid& databaseUuid);
bool listIdentities(QList<QSharedPointer<OpenSSHKey>>& list);
bool checkIdentity(OpenSSHKey& key, bool& loaded);
bool checkIdentity(const OpenSSHKey& key, bool& loaded);
bool removeIdentity(OpenSSHKey& key);
void removeAllIdentities();
void setAutoRemoveOnLock(const OpenSSHKey& key, bool autoRemove);
@ -59,7 +59,8 @@ signals:
void enabledChanged(bool enabled);
public slots:
void databaseModeChanged();
void databaseLocked();
void databaseUnlocked();
private:
const quint8 SSH_AGENT_FAILURE = 5;
@ -81,7 +82,7 @@ private:
const quint32 AGENT_COPYDATA_ID = 0x804e50ba;
#endif
QHash<OpenSSHKey, bool> m_addedKeys;
QHash<OpenSSHKey, QPair<QUuid, bool>> m_addedKeys;
QString m_error;
};