Fixed GCC issues for const initialization

Fixed issues reported by GCC for initialization of const variables
This commit is contained in:
Christian Kieschnick 2019-01-04 12:28:36 +01:00
parent b204451d06
commit 51d63f0e83
2 changed files with 15 additions and 15 deletions

View File

@ -80,7 +80,7 @@ QPair<Trust, KeeShareSettings::Certificate> check(QByteArray& data,
certificate = sign.certificate;
auto key = sign.certificate.sshKey();
key.openKey(QString());
const auto signer = Signature{};
const auto signer = Signature{};
if (!signer.verify(data, sign.signature, key)) {
qCritical("Invalid signature for sharing container %s.", qPrintable(reference.path));
return {Invalid, KeeShareSettings::Certificate()};
@ -428,8 +428,8 @@ ShareObserver::Result ShareObserver::importInsecureContainerInto(const KeeShareS
}
auto foreign = KeeShare::foreign();
auto own = KeeShare::own();
static KeeShareSettings::Sign sign; // invalid sign
const auto own = KeeShare::own();
const auto sign = KeeShareSettings::Sign{}; // invalid sign
auto trust = check(payload, reference, own.certificate, foreign.certificates, sign);
switch(trust.first) {
case UntrustedForever:

View File

@ -108,34 +108,34 @@ void TestSharing::testNullObjects()
const QString empty;
QXmlStreamReader reader(empty);
const KeeShareSettings::Key nullKey = {};
const auto nullKey = KeeShareSettings::Key{};
QVERIFY(nullKey.isNull());
const KeeShareSettings::Key xmlKey = KeeShareSettings::Key::deserialize(reader);
const auto xmlKey = KeeShareSettings::Key::deserialize(reader);
QVERIFY(xmlKey.isNull());
const KeeShareSettings::Certificate certificate = {};
const auto certificate = KeeShareSettings::Certificate{};
QVERIFY(certificate.isNull());
const KeeShareSettings::Certificate xmlCertificate = KeeShareSettings::Certificate::deserialize(reader);
const auto xmlCertificate = KeeShareSettings::Certificate::deserialize(reader);
QVERIFY(xmlCertificate.isNull());
const KeeShareSettings::Own own = {};
const auto own = KeeShareSettings::Own{};
QVERIFY(own.isNull());
const KeeShareSettings::Own xmlOwn = KeeShareSettings::Own::deserialize(empty);
const auto xmlOwn = KeeShareSettings::Own::deserialize(empty);
QVERIFY(xmlOwn.isNull());
const KeeShareSettings::Active active = {};
const auto active = KeeShareSettings::Active{};
QVERIFY(active.isNull());
const KeeShareSettings::Active xmlActive = KeeShareSettings::Active::deserialize(empty);
const auto xmlActive = KeeShareSettings::Active::deserialize(empty);
QVERIFY(xmlActive.isNull());
const KeeShareSettings::Foreign foreign = {};
const auto foreign = KeeShareSettings::Foreign{};
QVERIFY(foreign.certificates.isEmpty());
const KeeShareSettings::Foreign xmlForeign = KeeShareSettings::Foreign::deserialize(empty);
const auto xmlForeign = KeeShareSettings::Foreign::deserialize(empty);
QVERIFY(xmlForeign.certificates.isEmpty());
const KeeShareSettings::Reference reference = {};
const auto reference = KeeShareSettings::Reference{};
QVERIFY(reference.isNull());
const KeeShareSettings::Reference xmlReference = KeeShareSettings::Reference::deserialize(empty);
const auto xmlReference = KeeShareSettings::Reference::deserialize(empty);
QVERIFY(xmlReference.isNull());
}