Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/ipcmessage.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,16 @@ struct IpcMessage {
}

static QByteArray encode(const QString &execCommand, const QStringList &execArgs, const QString &sessionName) {
const QString cleanName = sanitizeSessionName(sessionName);
if (!execCommand.isEmpty()) {
QByteArray cmdBytes = execCommand.toUtf8();
for (const QString &arg : execArgs) {
cmdBytes.append('\0');
cmdBytes.append(arg.toUtf8());
}
return (QStringLiteral("exec:") + sessionName + QStringLiteral(":")).toUtf8() + cmdBytes + '\n';
} else if (!sessionName.isEmpty()) {
return (QStringLiteral("switch:") + sessionName + QStringLiteral("\n")).toUtf8();
return (QStringLiteral("exec:") + cleanName + QStringLiteral(":")).toUtf8() + cmdBytes + '\n';
} else if (!cleanName.isEmpty()) {
return (QStringLiteral("switch:") + cleanName + QStringLiteral("\n")).toUtf8();
}
return QByteArrayLiteral("raise\n");
}
Expand Down
1 change: 1 addition & 0 deletions src/scrollencryptor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ QByteArray ScrollEncryptor::encrypt(const QByteArray &plaintext)
enc.setData(padded);
enc.setInitializationVector(iv);
enc.setKey(*m_keyReference);
// CBC without MAC is intentional: device-lock key, bit-flip malleability accepted.
enc.setBlockMode(CryptoManager::BlockModeCbc);
enc.setPadding(CryptoManager::EncryptionPaddingNone);
enc.setCryptoPluginName(CryptoManager::DefaultCryptoStoragePluginName);
Expand Down
Loading