summaryrefslogtreecommitdiffstats
path: root/framework/src/domain/mime/mimetreeparser/applicationpkcs7mime.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'framework/src/domain/mime/mimetreeparser/applicationpkcs7mime.cpp')
-rw-r--r--framework/src/domain/mime/mimetreeparser/applicationpkcs7mime.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/applicationpkcs7mime.cpp b/framework/src/domain/mime/mimetreeparser/applicationpkcs7mime.cpp
index f65aa938..4780439b 100644
--- a/framework/src/domain/mime/mimetreeparser/applicationpkcs7mime.cpp
+++ b/framework/src/domain/mime/mimetreeparser/applicationpkcs7mime.cpp
@@ -24,8 +24,6 @@
24#include "objecttreeparser.h" 24#include "objecttreeparser.h"
25#include "messagepart.h" 25#include "messagepart.h"
26 26
27#include <QGpgME/Protocol>
28
29#include <KMime/Content> 27#include <KMime/Content>
30 28
31#include <QTextCodec> 29#include <QTextCodec>
@@ -56,7 +54,7 @@ MessagePart::Ptr ApplicationPkcs7MimeBodyPartFormatter::process(Interface::BodyP
56 const QString smimeType = node->contentType()->parameter(QStringLiteral("smime-type")).toLower(); 54 const QString smimeType = node->contentType()->parameter(QStringLiteral("smime-type")).toLower();
57 55
58 if (smimeType == QLatin1String("certs-only")) { 56 if (smimeType == QLatin1String("certs-only")) {
59 return CertMessagePart::Ptr(new CertMessagePart(part.objectTreeParser(), node, GpgME::CMS)); 57 return CertMessagePart::Ptr(new CertMessagePart(part.objectTreeParser(), node, CMS));
60 } 58 }
61 59
62 bool isSigned = (smimeType == QLatin1String("signed-data")); 60 bool isSigned = (smimeType == QLatin1String("signed-data"));
@@ -79,7 +77,7 @@ MessagePart::Ptr ApplicationPkcs7MimeBodyPartFormatter::process(Interface::BodyP
79 } 77 }
80 78
81 auto _mp = EncryptedMessagePart::Ptr(new EncryptedMessagePart(part.objectTreeParser(), 79 auto _mp = EncryptedMessagePart::Ptr(new EncryptedMessagePart(part.objectTreeParser(),
82 node->decodedText(), GpgME::CMS, 80 node->decodedText(), CMS,
83 part.nodeHelper()->fromAsString(node), node)); 81 part.nodeHelper()->fromAsString(node), node));
84 mp = _mp; 82 mp = _mp;
85 _mp->setIsEncrypted(true); 83 _mp->setIsEncrypted(true);
@@ -125,7 +123,7 @@ MessagePart::Ptr ApplicationPkcs7MimeBodyPartFormatter::process(Interface::BodyP
125 const QTextCodec *aCodec(part.objectTreeParser()->codecFor(signTestNode)); 123 const QTextCodec *aCodec(part.objectTreeParser()->codecFor(signTestNode));
126 const QByteArray signaturetext = signTestNode->decodedContent(); 124 const QByteArray signaturetext = signTestNode->decodedContent();
127 auto mp = SignedMessagePart::Ptr(new SignedMessagePart(part.objectTreeParser(), 125 auto mp = SignedMessagePart::Ptr(new SignedMessagePart(part.objectTreeParser(),
128 aCodec->toUnicode(signaturetext), GpgME::CMS, 126 aCodec->toUnicode(signaturetext), CMS,
129 part.nodeHelper()->fromAsString(node), signTestNode, signTestNode)); 127 part.nodeHelper()->fromAsString(node), signTestNode, signTestNode));
130 } 128 }
131 return mp; 129 return mp;