diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-07-03 16:17:10 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2018-07-03 16:17:10 +0200 |
commit | 6b75d9515a0fddf88f7ee012ca03724baf6e7565 (patch) | |
tree | 72ddebebe3feddf98f9058a0a9026e6fdbe0a30c | |
parent | 5af3030e7ce086a26372dfc1c1b9bba69c85491b (diff) | |
download | kube-6b75d9515a0fddf88f7ee012ca03724baf6e7565.tar.gz kube-6b75d9515a0fddf88f7ee012ca03724baf6e7565.zip |
Fixed and tested isGoodSignature
-rw-r--r-- | framework/src/domain/mime/mimetreeparser/messagepart.cpp | 2 | ||||
-rw-r--r-- | framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp index 3ab43990..4c12a9d9 100644 --- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp +++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp | |||
@@ -696,7 +696,7 @@ static QString prettifyDN(const char *uid) | |||
696 | 696 | ||
697 | void SignedMessagePart::sigStatusToMetaData(const Signature &signature) | 697 | void SignedMessagePart::sigStatusToMetaData(const Signature &signature) |
698 | { | 698 | { |
699 | mMetaData.isGoodSignature = signature.status & GPG_ERR_NO_ERROR; | 699 | mMetaData.isGoodSignature = signature.status == GPG_ERR_NO_ERROR; |
700 | // save extended signature status flags | 700 | // save extended signature status flags |
701 | auto summary = signature.summary; | 701 | auto summary = signature.summary; |
702 | mMetaData.keyMissing = summary & GPGME_SIGSUM_KEY_MISSING; | 702 | mMetaData.keyMissing = summary & GPGME_SIGSUM_KEY_MISSING; |
diff --git a/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp b/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp index a4b347e7..bb4e86ce 100644 --- a/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp +++ b/framework/src/domain/mime/mimetreeparser/tests/mimetreeparsertest.cpp | |||
@@ -355,6 +355,18 @@ private slots: | |||
355 | QCOMPARE(part->signatures().size(), 1); | 355 | QCOMPARE(part->signatures().size(), 1); |
356 | QCOMPARE(part->encryptionState(), MimeTreeParser::KMMsgNotEncrypted); | 356 | QCOMPARE(part->encryptionState(), MimeTreeParser::KMMsgNotEncrypted); |
357 | QCOMPARE(part->signatureState(), MimeTreeParser::KMMsgFullySigned); | 357 | QCOMPARE(part->signatureState(), MimeTreeParser::KMMsgFullySigned); |
358 | |||
359 | QCOMPARE(part->partMetaData()->isGoodSignature, true); | ||
360 | QCOMPARE(part->partMetaData()->keyIsTrusted, true); | ||
361 | QCOMPARE(part->partMetaData()->keyMissing, false); | ||
362 | QCOMPARE(part->partMetaData()->keyExpired, false); | ||
363 | QCOMPARE(part->partMetaData()->keyRevoked, false); | ||
364 | QCOMPARE(part->partMetaData()->sigExpired, false); | ||
365 | QCOMPARE(part->partMetaData()->crlMissing, false); | ||
366 | QCOMPARE(part->partMetaData()->crlTooOld, false); | ||
367 | QCOMPARE(part->partMetaData()->keyId, QByteArray{"8D9860C58F246DE6"}); | ||
368 | QCOMPARE(part->partMetaData()->signer, {"unittest key (no password) <test@kolab.org>"}); | ||
369 | QCOMPARE(part->partMetaData()->signerMailAddresses, QStringList{{"test@kolab.org"}}); | ||
358 | } | 370 | } |
359 | 371 | ||
360 | void testEncryptedAndSigned() | 372 | void testEncryptedAndSigned() |