Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-25 15:10:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

SSH Agent: Store raw key data as complete blobs

Browse source 
This is a prerequisite for security key backed keys.
This commit is contained in:
Toni Spets 2021-02-21 11:22:12 +02:00 • committed by Jonathan White
parent 17d51b558e
commit 6ded326de7
3 changed files with 45 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/sshagent/OpenSSHKey.cpp
View file

@ -39,8 +39,8 @@ OpenSSHKey::OpenSSHKey(QObject* parent)
, m_kdfOptions(QByteArray())
, m_rawType(QString())
, m_rawData(QByteArray())
, m_rawPublicData(QList<QByteArray>())
, m_rawPrivateData(QList<QByteArray>())
, m_rawPublicData(QByteArray())
, m_rawPrivateData(QByteArray())
, m_comment(QString())
, m_error(QString())
{
@ -87,10 +87,7 @@ const QString OpenSSHKey::fingerprint(QCryptographicHash::Algorithm algo) const
BinaryStream stream(&publicKey);
stream.writeString(m_type);
for (const QByteArray& ba : m_rawPublicData) {
stream.writeString(ba);
}
stream.write(m_rawPublicData);
QByteArray rawHash = QCryptographicHash::hash(publicKey, algo);
@ -123,10 +120,7 @@ const QString OpenSSHKey::publicKey() const
BinaryStream stream(&publicKey);
stream.writeString(m_type);
for (QByteArray ba : m_rawPublicData) {
stream.writeString(ba);
}
stream.write(m_rawPublicData);
return m_type + " " + QString::fromLatin1(publicKey.toBase64()) + " " + m_comment;
}
@ -141,12 +135,12 @@ void OpenSSHKey::setType(const QString& type)
m_type = type;
}
void OpenSSHKey::setPublicData(const QList<QByteArray>& data)
void OpenSSHKey::setPublicData(const QByteArray& data)
{
m_rawPublicData = data;
}
void OpenSSHKey::setPrivateData(const QList<QByteArray>& data)
void OpenSSHKey::setPrivateData(const QByteArray& data)
{
m_rawPrivateData = data;
}
@ -437,6 +431,7 @@ bool OpenSSHKey::openKey(const QString& passphrase)
bool OpenSSHKey::readPublic(BinaryStream& stream)
{
m_rawPublicData.clear();
BinaryStream rawPublicDataStream(&m_rawPublicData);
if (!stream.readString(m_type)) {
m_error = tr("Unexpected EOF while reading public key");
@ -465,7 +460,7 @@ bool OpenSSHKey::readPublic(BinaryStream& stream)
return false;
}
m_rawPublicData.append(t);
rawPublicDataStream.writeString(t);
}
return true;
@ -474,6 +469,7 @@ bool OpenSSHKey::readPublic(BinaryStream& stream)
bool OpenSSHKey::readPrivate(BinaryStream& stream)
{
m_rawPrivateData.clear();
BinaryStream rawPrivateDataStream(&m_rawPrivateData);
if (!stream.readString(m_type)) {
m_error = tr("Unexpected EOF while reading private key");
@ -502,7 +498,7 @@ bool OpenSSHKey::readPrivate(BinaryStream& stream)
return false;
}
m_rawPrivateData.append(t);
rawPrivateDataStream.writeString(t);
}
if (!stream.readString(m_comment)) {
@ -525,11 +521,9 @@ bool OpenSSHKey::writePublic(BinaryStream& stream)
return false;
}
for (QByteArray t : m_rawPublicData) {
if (!stream.writeString(t)) {
m_error = tr("Unexpected EOF when writing public key");
return false;
}
if (!stream.write(m_rawPublicData)) {
m_error = tr("Unexpected EOF when writing public key");
return false;
}
return true;
@ -547,11 +541,9 @@ bool OpenSSHKey::writePrivate(BinaryStream& stream)
return false;
}
for (QByteArray t : m_rawPrivateData) {
if (!stream.writeString(t)) {
m_error = tr("Unexpected EOF when writing private key");
return false;
}
if (!stream.write(m_rawPrivateData)) {
m_error = tr("Unexpected EOF when writing private key");
return false;
}
if (!stream.writeString(m_comment)) {