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

Add ECC signature support to central configuration #141

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add ECC signature support to central configuration #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ if( CONFIG_URL )
set_source_files_properties(Configuration.cpp PROPERTIES COMPILE_DEFINITIONS LAST_CHECK_DAYS=${LAST_CHECK_DAYS})
endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config.json AND
EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config.rsa AND
EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config.pub)
EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config.ecc AND
EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/config.ecpub)
set(CONFIG_DIR ${CMAKE_CURRENT_SOURCE_DIR})
else()
file(DOWNLOAD ${CONFIG_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.json)
string(REPLACE ".json" ".rsa" RSA_URL ${CONFIG_URL} )
file(DOWNLOAD ${RSA_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.rsa)
string(REPLACE ".json" ".pub" PUB_URL ${CONFIG_URL} )
file(DOWNLOAD ${PUB_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.pub)
string(REPLACE ".json" ".ecc" ECC_URL ${CONFIG_URL})
file(DOWNLOAD ${ECC_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.ecc)
string(REPLACE ".json" ".ecpub" PUB_URL ${CONFIG_URL})
file(DOWNLOAD ${PUB_URL} ${CMAKE_CURRENT_BINARY_DIR}/config.ecpub)
set(CONFIG_DIR ${CMAKE_CURRENT_BINARY_DIR})
endif()
qt_add_resources(qdigidoccommon config BASE ${CONFIG_DIR} PREFIX / FILES
${CONFIG_DIR}/config.json ${CONFIG_DIR}/config.rsa ${CONFIG_DIR}/config.pub
${CONFIG_DIR}/config.json ${CONFIG_DIR}/config.ecc ${CONFIG_DIR}/config.ecpub
)
target_compile_definitions(qdigidoccommon PUBLIC CONFIG_URL="${CONFIG_URL}")
target_sources(qdigidoccommon PRIVATE Configuration.cpp)
Expand Down
56 changes: 23 additions & 33 deletions Configuration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,19 @@

#include "Common.h"
#include <QtCore/QCoreApplication>
#include <QtCore/QCryptographicHash>
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <QtCore/QFileInfo>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QSettings>
#include <QtCore/QStandardPaths>
#include <QtCore/QTimer>
#include <QtCore/QSettings>
#include <QtCore/QVersionNumber>
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply>
#include <QtNetwork/QNetworkRequest>

#include <openssl/err.h>
#include <openssl/evp.h>
Expand Down Expand Up @@ -76,7 +75,7 @@ class Configuration::Private
#endif
QByteArray data, signature;
QJsonObject dataobject;
QUrl rsaurl, url = QUrl(QStringLiteral(CONFIG_URL));
QUrl eccurl, url = QUrl(QStringLiteral(CONFIG_URL));
std::unique_ptr<EVP_PKEY,free_deleter<EVP_PKEY_free>> publicKey;
QNetworkRequest req;
QNetworkAccessManager *net = nullptr;
Expand All @@ -100,10 +99,10 @@ void Configuration::Private::initCache(bool clear)
return f.open(QFile::ReadOnly) ? f.readAll() : QByteArray();
};
setData(readAll(url, QStringLiteral(":/config.json")),
readAll(rsaurl, QStringLiteral(":/config.rsa")));
readAll(eccurl, QStringLiteral(":/config.ecc")));
#else
setData(readFile(QStringLiteral(":/config.json")),
readFile(QStringLiteral(":/config.rsa")));
readFile(QStringLiteral(":/config.ecc")));
#endif
}

Expand Down Expand Up @@ -135,30 +134,21 @@ bool Configuration::Private::validate(const QByteArray &data, const QByteArray &
return false;

QByteArray sig = QByteArray::fromBase64(signature);
size_t size = 0;
auto ctx = std::unique_ptr<EVP_PKEY_CTX,free_deleter<EVP_PKEY_CTX_free>>(EVP_PKEY_CTX_new(publicKey.get(), nullptr));
if(!ctx || EVP_PKEY_verify_recover_init(ctx.get()) < 1 ||
EVP_PKEY_verify_recover(ctx.get(), nullptr, &size,
(const unsigned char*)sig.constData(), size_t(sig.size())) < 1)
return false;
QByteArray digest(qsizetype(size), '\0');
if(EVP_PKEY_verify_recover(ctx.get(), (unsigned char*)digest.data(), &size,
(const unsigned char*)sig.constData(), size_t(sig.size())) < 1)
const EVP_MD *md = [&]{
switch(EVP_PKEY_bits(publicKey.get()))
{
case SHA256_DIGEST_LENGTH * 8: return EVP_sha256();
case SHA384_DIGEST_LENGTH * 8: return EVP_sha384();
default: return EVP_sha512();
}
}();
if(std::unique_ptr<EVP_MD_CTX,free_deleter<EVP_MD_CTX_free>> ctx(EVP_MD_CTX_new());
!ctx ||
EVP_DigestVerifyInit(ctx.get(), nullptr, md, nullptr, publicKey.get()) < 1 ||
EVP_DigestVerify(ctx.get(), (const unsigned char*)sig.constData(), size_t(sig.size()),
(const unsigned char*)data.constData(), size_t(data.size())) < 1)
return false;
digest.resize(qsizetype(size));

using item = std::pair<QCryptographicHash::Algorithm,QByteArray>;
static const std::array list {
item{QCryptographicHash::Sha1, QByteArray::fromHex("3021300906052b0e03021a05000414")},
item{QCryptographicHash::Sha224, QByteArray::fromHex("302d300d06096086480165030402040500041c")},
item{QCryptographicHash::Sha256, QByteArray::fromHex("3031300d060960864801650304020105000420")},
item{QCryptographicHash::Sha384, QByteArray::fromHex("3041300d060960864801650304020205000430")},
item{QCryptographicHash::Sha512, QByteArray::fromHex("3051300d060960864801650304020305000440")},
};
if(std::none_of(list.cbegin(), list.cend(), [&](const auto &item) {
return digest == item.second + QCryptographicHash::hash(data, item.first);
}))
return false;
QString date = headerValue(toObject(data), QLatin1String("DATE")).toString();
return QDateTime::currentDateTimeUtc() > QDateTime::fromString(date, QStringLiteral("yyyyMMddHHmmss'Z'"));
}
Expand All @@ -172,7 +162,7 @@ Configuration::Configuration(QObject *parent)
#ifndef NO_CACHE
QDir().mkpath(d->cache);
#endif
d->rsaurl = QStringLiteral("%1%2.rsa").arg(
d->eccurl = QStringLiteral("%1%2.ecc").arg(
d->url.adjusted(QUrl::RemoveFilename).toString(),
QFileInfo(d->url.fileName()).baseName());
d->req.setRawHeader("User-Agent", QStringLiteral("%1/%2 (%3) Lang: %4 Devices: %5")
Expand All @@ -191,7 +181,7 @@ Configuration::Configuration(QObject *parent)
Q_EMIT finished(false, reply->errorString());
return;
}
if(reply->url() == d->rsaurl)
if(reply->url() == d->eccurl)
{
QByteArray signature = reply->readAll();
if(d->validate(d->data, signature))
Expand Down Expand Up @@ -234,7 +224,7 @@ Configuration::Configuration(QObject *parent)
f.write(data);
};
writeAll(d->url.fileName(), d->data);
writeAll(d->rsaurl.fileName(), d->signature);
writeAll(d->eccurl.fileName(), d->signature);
#endif
#ifdef LAST_CHECK_DAYS
d->s.setValue(QStringLiteral("LastCheck"), QDate::currentDate().toString(QStringLiteral("yyyyMMdd")));
Expand All @@ -243,7 +233,7 @@ Configuration::Configuration(QObject *parent)
}
});

QByteArray key = readFile(QStringLiteral(":/config.pub"));
QByteArray key = readFile(QStringLiteral(":/config.ecpub"));
BIO *bio = BIO_new_mem_buf(key.constData(), int(key.size()));
if(!bio)
{
Expand Down Expand Up @@ -303,7 +293,7 @@ QJsonObject Configuration::object() const
void Configuration::update(bool force)
{
d->initCache(force);
d->req.setUrl(d->rsaurl);
d->req.setUrl(d->eccurl);
d->net->get(d->req);
QSettings().setValue(QStringLiteral("LastVersion"), QCoreApplication::applicationVersion());
}
Loading