StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

chore(core): improve failed decryption error handling

Browse Source
This commit is contained in:
Anthony Bilinski 2018-10-31 11:51:57 -07:00
parent 5c1fe52010
commit e1201f901f
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/toxencrypt.cpp
View File

@ -325,6 +325,10 @@ QString getDecryptionError(TOX_ERR_DECRYPTION error)
"The input data was shorter than TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes."); "The input data was shorter than TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes.");
case TOX_ERR_DECRYPTION_BAD_FORMAT: case TOX_ERR_DECRYPTION_BAD_FORMAT:
return QStringLiteral("The input data is missing the magic number or is corrupted."); return QStringLiteral("The input data is missing the magic number or is corrupted.");
case TOX_ERR_DECRYPTION_KEY_DERIVATION_FAILED:
return QStringLiteral("The crypto lib was unable to derive a key from the given passphrase.");
case TOX_ERR_DECRYPTION_FAILED:
return QStringLiteral("Decryption failed. Either the data was corrupted or the password/key was incorrect.");
default: default:
return QStringLiteral("Unknown decryption error."); return QStringLiteral("Unknown decryption error.");
} }

6
src/core/toxencrypt.h
View File

@ -17,12 +17,12 @@
along with qTox. If not, see <http://www.gnu.org/licenses/>. along with qTox. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QByteArray>
#include <QString>
#ifndef TOXENCRYPT_H #ifndef TOXENCRYPT_H
#define TOXENCRYPT_H #define TOXENCRYPT_H
#include <QByteArray>
#include <QString>
#include <memory> #include <memory>
struct Tox_Pass_Key; struct Tox_Pass_Key;

9
src/persistence/profile.cpp
View File

@ -436,11 +436,11 @@ QPixmap Profile::loadAvatar(const ToxPk& owner)
QPixmap pic; QPixmap pic;
if (Settings::getInstance().getShowIdenticons()) { if (Settings::getInstance().getShowIdenticons()) {
const QByteArray avataData = loadAvatarData(owner); const QByteArray avatarData = loadAvatarData(owner);
if (avataData.isEmpty()) { if (avatarData.isEmpty()) {
pic = QPixmap::fromImage(Identicon(owner.getKey()).toImage(16)); pic = QPixmap::fromImage(Identicon(owner.getKey()).toImage(16));
} else { } else {
pic.loadFromData(avataData); pic.loadFromData(avatarData);
} }
} else { } else {
@ -473,6 +473,9 @@ QByteArray Profile::loadAvatarData(const ToxPk& owner)
QByteArray pic = file.readAll(); QByteArray pic = file.readAll();
if (avatarEncrypted && !pic.isEmpty()) { if (avatarEncrypted && !pic.isEmpty()) {
pic = passkey->decrypt(pic); pic = passkey->decrypt(pic);
if (pic.isEmpty()) {
qWarning() << "Failed to decrypt avatar at" << path;
}
} }
return pic; return pic;