Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uses QByteArray to store private key. #727

Merged
merged 2 commits into from
Oct 23, 2018
Merged

Uses QByteArray to store private key. #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45ff338
Uses QByteArray to store private key.
Oct 14, 2018
1c8307f
Merge branch 'master' into fix-issue-268
rullzer Oct 23, 2018
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
26 changes: 14 additions & 12 deletions src/libsync/clientsideencryption.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,10 +390,9 @@ QByteArray decryptStringSymmetric(const QByteArray& key, const QByteArray& data)
return result;
}

QByteArray privateKeyToPem(const QSslKey key) {
QByteArray privateKeyToPem(const QByteArray key) {
BIO *privateKeyBio = BIO_new(BIO_s_mem());
QByteArray privateKeyPem = key.toPem();
BIO_write(privateKeyBio, privateKeyPem.constData(), privateKeyPem.size());
BIO_write(privateKeyBio, key.constData(), key.size());
EVP_PKEY *pkey = PEM_read_bio_PrivateKey(privateKeyBio, NULL, NULL, NULL);

BIO *pemBio = BIO_new(BIO_s_mem());
Expand Down Expand Up @@ -694,7 +693,8 @@ void ClientSideEncryption::privateKeyFetched(Job *incoming) {
return;
}

_privateKey = QSslKey(readJob->binaryData(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
//_privateKey = QSslKey(readJob->binaryData(), QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
_privateKey = readJob->binaryData();

if (_privateKey.isNull()) {
getPrivateKeyFromServer();
Expand Down Expand Up @@ -723,7 +723,7 @@ void ClientSideEncryption::mnemonicKeyFetched(QKeychain::Job *incoming) {
if (readJob->error() != NoError || readJob->textData().length() == 0) {
_certificate = QSslCertificate();
_publicKey = QSslKey();
_privateKey = QSslKey();
_privateKey = QByteArray();
getPublicKeyFromServer();
return;
}
Expand All @@ -745,7 +745,7 @@ void ClientSideEncryption::writePrivateKey() {
WritePasswordJob *job = new WritePasswordJob(Theme::instance()->appName());
job->setInsecureFallback(false);
job->setKey(kck);
job->setBinaryData(_privateKey.toPem());
job->setBinaryData(_privateKey);
connect(job, &WritePasswordJob::finished, [this](Job *incoming) {
Q_UNUSED(incoming);
qCInfo(lcCse()) << "Private key stored in keychain";
Expand Down Expand Up @@ -791,7 +791,7 @@ void ClientSideEncryption::writeMnemonic() {

void ClientSideEncryption::forgetSensitiveData()
{
_privateKey = QSslKey();
_privateKey = QByteArray();
_certificate = QSslCertificate();
_publicKey = QSslKey();
_mnemonic = QString();
Expand Down Expand Up @@ -859,7 +859,8 @@ void ClientSideEncryption::generateKeyPair()
return;
}
QByteArray key = BIO2ByteArray(privKey);
_privateKey = QSslKey(key, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
//_privateKey = QSslKey(key, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
_privateKey = key;

qCInfo(lcCse()) << "Keys generated correctly, sending to server.";
generateCSR(localKeyPair);
Expand Down Expand Up @@ -1025,9 +1026,10 @@ void ClientSideEncryption::decryptPrivateKey(const QByteArray &key) {
qCInfo(lcCse()) << "Generated key:" << pass;

QByteArray privateKey = EncryptionHelper::decryptPrivateKey(pass, key2);
_privateKey = QSslKey(privateKey, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
//_privateKey = QSslKey(privateKey, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
_privateKey = privateKey;

qCInfo(lcCse()) << "Private key: " << _privateKey.toPem();
qCInfo(lcCse()) << "Private key: " << _privateKey;

if (!_privateKey.isNull()) {
writePrivateKey();
Expand All @@ -1037,7 +1039,7 @@ void ClientSideEncryption::decryptPrivateKey(const QByteArray &key) {
}
} else {
_mnemonic = QString();
_privateKey = QSslKey();
_privateKey = QByteArray();
qCInfo(lcCse()) << "Cancelled";
break;
}
Expand Down Expand Up @@ -1226,7 +1228,7 @@ QByteArray FolderMetadata::encryptMetadataKey(const QByteArray& data) const {
QByteArray FolderMetadata::decryptMetadataKey(const QByteArray& encryptedMetadata) const
{
BIO *privateKeyBio = BIO_new(BIO_s_mem());
QByteArray privateKeyPem = _account->e2e()->_privateKey.toPem();
QByteArray privateKeyPem = _account->e2e()->_privateKey;
BIO_write(privateKeyBio, privateKeyPem.constData(), privateKeyPem.size());
EVP_PKEY *key = PEM_read_bio_PrivateKey(privateKeyBio, NULL, NULL, NULL);

Expand Down
5 changes: 3 additions & 2 deletions src/libsync/clientsideencryption.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace EncryptionHelper {
const QByteArray& data
);

QByteArray privateKeyToPem(const QSslKey key);
QByteArray privateKeyToPem(const QByteArray key);

//TODO: change those two EVP_PKEY into QSslKey.
QByteArray encryptStringAsymmetric(
Expand Down Expand Up @@ -122,7 +122,8 @@ private slots:
QMap<QString, bool> _folder2encryptedStatus;

public:
QSslKey _privateKey;
//QSslKey _privateKey;
QByteArray _privateKey;
QSslKey _publicKey;
QSslCertificate _certificate;
QString _mnemonic;
Expand Down