Commit 46e73409 authored by Sandro Knauß's avatar Sandro Knauß

Only allow read of phassphraseError from outside

parent 0e19a836
......@@ -1706,6 +1706,11 @@ bool CryptoMessagePart::isEncrypted() const
return mMetaData.isEncrypted;
}
bool CryptoMessagePart::passphraseError() const
{
return mPassphraseError;
}
void CryptoMessagePart::startDecryption(const QByteArray &text, const QTextCodec *aCodec)
{
KMime::Content *content = new KMime::Content;
......
......@@ -407,13 +407,14 @@ public:
void setIsEncrypted(bool encrypted);
bool isEncrypted() const;
bool passphraseError() const;
void startDecryption(const QByteArray &text, const QTextCodec *aCodec);
void startDecryption(KMime::Content *data = 0);
void startVerification(const QByteArray &text, const QTextCodec *aCodec);
void startVerificationDetached(const QByteArray &text, KMime::Content *textNode, const QByteArray &signature);
void html(bool decorate) Q_DECL_OVERRIDE;
bool mPassphraseError;
QByteArray mDecryptedData;
std::vector<GpgME::Signature> mSignatures;
......@@ -423,6 +424,7 @@ private:
void writeDeferredDecryptionBlock() const;
protected:
bool mPassphraseError;
const Kleo::CryptoBackend::Protocol *mCryptoProto;
QString mFromAddress;
KMime::Content *mNode;
......
......@@ -1060,7 +1060,7 @@ MessagePart::Ptr ObjectTreeParser::processApplicationPkcs7MimeSubtype(KMime::Con
// decryption failed, or because we didn't know if it was encrypted, tried,
// and failed. If the message was not actually encrypted, we continue
// assuming it's signed
if (mp->mPassphraseError || (smimeType.isEmpty() && messagePart->isEncrypted)) {
if (mp->passphraseError() || (smimeType.isEmpty() && messagePart->isEncrypted)) {
isEncrypted = true;
signTestNode = 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment