Add key serialization to support Quick Unlock
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
|
||||
#include "crypto/CryptoHash.h"
|
||||
|
||||
#include <QDataStream>
|
||||
#include <QSharedPointer>
|
||||
|
||||
QUuid PasswordKey::UUID("77e90411-303a-43f2-b773-853b05635ead");
|
||||
@@ -46,21 +47,44 @@ QByteArray PasswordKey::rawKey() const
|
||||
return QByteArray(m_key.data(), m_key.size());
|
||||
}
|
||||
|
||||
void PasswordKey::setPassword(const QString& password)
|
||||
void PasswordKey::setRawKey(const QByteArray& data)
|
||||
{
|
||||
setHash(CryptoHash::hash(password.toUtf8(), CryptoHash::Sha256));
|
||||
if (data.isEmpty()) {
|
||||
m_key.clear();
|
||||
m_isInitialized = false;
|
||||
} else {
|
||||
Q_ASSERT(data.size() == SHA256_SIZE);
|
||||
m_key.assign(data.begin(), data.end());
|
||||
m_isInitialized = true;
|
||||
}
|
||||
}
|
||||
|
||||
void PasswordKey::setHash(const QByteArray& hash)
|
||||
void PasswordKey::setPassword(const QString& password)
|
||||
{
|
||||
Q_ASSERT(hash.size() == SHA256_SIZE);
|
||||
std::memcpy(m_key.data(), hash.data(), std::min(SHA256_SIZE, hash.size()));
|
||||
m_isInitialized = true;
|
||||
setRawKey(CryptoHash::hash(password.toUtf8(), CryptoHash::Sha256));
|
||||
}
|
||||
|
||||
QSharedPointer<PasswordKey> PasswordKey::fromRawKey(const QByteArray& rawKey)
|
||||
{
|
||||
auto result = QSharedPointer<PasswordKey>::create();
|
||||
result->setHash(rawKey);
|
||||
result->setRawKey(rawKey);
|
||||
return result;
|
||||
}
|
||||
|
||||
QByteArray PasswordKey::serialize() const
|
||||
{
|
||||
QByteArray data;
|
||||
QDataStream stream(&data, QIODevice::WriteOnly);
|
||||
stream << uuid().toRfc4122() << rawKey();
|
||||
return data;
|
||||
}
|
||||
|
||||
void PasswordKey::deserialize(const QByteArray& data)
|
||||
{
|
||||
QByteArray uuidData, key;
|
||||
QDataStream stream(data);
|
||||
stream >> uuidData >> key;
|
||||
if (uuid().toRfc4122() == uuidData) {
|
||||
setRawKey(key);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user