alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mu-msg-file: check for top-level s/mime

Browse Source 
Update the content flags for top-level S/MIME encrypted & signed.
This commit is contained in:
Dirk-Jan C. Binnema
2022-01-09 11:36:39 +02:00
parent 4df94b0c86
commit ec41585dab
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/mu-msg-file.cc
View File

@ -354,6 +354,24 @@ msg_cflags_cb(GMimeObject* parent, GMimeObject* part, MuFlags* flags)
if (GMIME_IS_MULTIPART_ENCRYPTED(part)) if (GMIME_IS_MULTIPART_ENCRYPTED(part))
*flags |= MU_FLAG_ENCRYPTED; *flags |= MU_FLAG_ENCRYPTED;
/* smime */
if (GMIME_IS_APPLICATION_PKCS7_MIME(part)) {
GMimeApplicationPkcs7Mime *pkcs7;
pkcs7 = GMIME_APPLICATION_PKCS7_MIME(part);
if (pkcs7) {
switch(pkcs7->smime_type) {
case GMIME_SECURE_MIME_TYPE_ENVELOPED_DATA:
*flags |= MU_FLAG_ENCRYPTED;
break;
case GMIME_SECURE_MIME_TYPE_SIGNED_DATA:
*flags |= MU_FLAG_SIGNED;
break;
default:
break;
}
}
}
if (*flags & MU_FLAG_HAS_ATTACH) if (*flags & MU_FLAG_HAS_ATTACH)
return; return;
@ -367,6 +385,7 @@ msg_cflags_cb(GMimeObject* parent, GMimeObject* part, MuFlags* flags)
*flags |= MU_FLAG_HAS_ATTACH; *flags |= MU_FLAG_HAS_ATTACH;
} }
static MuFlags static MuFlags
get_content_flags(MuMsgFile* self) get_content_flags(MuMsgFile* self)
{ {
@ -375,11 +394,15 @@ get_content_flags(MuMsgFile* self)
flags = MU_FLAG_NONE; flags = MU_FLAG_NONE;
if (GMIME_IS_MESSAGE(self->_mime_msg)) if (GMIME_IS_MESSAGE(self->_mime_msg)) {
/* toplevel */
msg_cflags_cb(NULL, GMIME_OBJECT(self->_mime_msg), &flags);
/* parts */
mu_mime_message_foreach(self->_mime_msg, mu_mime_message_foreach(self->_mime_msg,
FALSE, /* never decrypt for this */ FALSE, /* never decrypt for this */
(GMimeObjectForeachFunc)msg_cflags_cb, (GMimeObjectForeachFunc)msg_cflags_cb,
&flags); &flags);
}
ml = get_mailing_list(self); ml = get_mailing_list(self);
if (ml) { if (ml) {