Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-11-07 01:12:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix out-of-memory crash with malformed ssh keys

Browse source 
* Reported by Oblivionsage - thank you!
This commit is contained in:
Jonathan White 2025-10-27 20:49:24 -04:00
parent 32b0f4ee9f
commit 298d401649
3 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
share/translations/keepassxc_en.ts
View file

@ -876,6 +876,17 @@ Ctrl+Shift+4 - Copy URL<br/>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BinaryStream</name>
<message>
<source>Failed to read string data: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>String length exceeds 10 MiB limit (requested %1)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BrowserAccessControlDialog</name>
<message>
@ -6694,10 +6705,6 @@ Expect some bugs and minor issues, this version is meant for testing purposes.</
<source>Found zero keys</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to read public key.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Corrupted key file, reading private key failed</source>
<translation type="unfinished"></translation>
@ -6786,6 +6793,14 @@ Expect some bugs and minor issues, this version is meant for testing purposes.</
<source>(encrypted)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to read key file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to read public key: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OpenSSHKeyGenDialog</name>

8
src/sshagent/BinaryStream.cpp
View file

@ -17,6 +17,7 @@
*/
#include "BinaryStream.h"
#include "core/Tools.h"
#include <QtEndian>
BinaryStream::BinaryStream(QIODevice* device)
@ -116,9 +117,16 @@ bool BinaryStream::readString(QByteArray& ba)
return false;
}
// Don't attempt to read strings over 10 MiB
if (length > 1024 * 1024 * 10) {
m_error = tr("String length exceeds 10 MiB limit (requested %1)").arg(Tools::humanReadableFileSize(length, 0));
return false;
}
ba.resize(length);
if (!read(ba.data(), ba.length())) {
m_error = tr("Failed to read string data: %1").arg(m_device->errorString());
return false;
}

9
src/sshagent/OpenSSHKey.cpp
View file

@ -312,9 +312,10 @@ bool OpenSSHKey::parsePKCS1PEM(const QByteArray& in)
return false;
}
stream.readString(m_cipherName);
stream.readString(m_kdfName);
stream.readString(m_kdfOptions);
if (!stream.readString(m_cipherName) || !stream.readString(m_kdfName) || !stream.readString(m_kdfOptions)) {
m_error = tr("Failed to read key file: %1").arg(stream.errorString());
return false;
}
quint32 numberOfKeys;
stream.read(numberOfKeys);
@ -327,7 +328,7 @@ bool OpenSSHKey::parsePKCS1PEM(const QByteArray& in)
for (quint32 i = 0; i < numberOfKeys; ++i) {
QByteArray publicKey;
if (!stream.readString(publicKey)) {
m_error = tr("Failed to read public key.");
m_error = tr("Failed to read public key: %1").arg(stream.errorString());
return false;
}