amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 16:35:10 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): S/MIME improvements

Browse Source 
Fixes #4891
Fixes #5450
This commit is contained in:
Francis Lachapelle
2022-01-21 16:24:13 -05:00
parent b061046992
commit 54b163da2d
6 changed files with 262 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/SOGoDraftObject.m
+10 -4
View File
@@ -1866,7 +1866,8 @@ static NSString *userAgent = nil;
{
NGMimeMessageGenerator *generator, *partGenerator;
NGMimeMessage *mimeMessage;
NSData *certificate, *content;
NSData *certificate, *content, *p7s;
NSArray *algos;
NGMutableHashMap *hashMap;
NGMimeMessage *message;
NSMutableData *d;
@@ -1910,17 +1911,22 @@ static NSString *userAgent = nil;
lookupName: @"Contacts"
inContext: context
acquire: NO];
certificate = [[contactFolders certificateForEmail: theRecipient] signersFromPKCS7];
p7s = [contactFolders certificateForEmail: theRecipient];
certificate = [p7s signersFromCMS];
algos = [p7s algosFromCMS];
}
else
certificate = [[self mailAccountFolder] certificate];
{
certificate = [[self mailAccountFolder] certificate];
algos = nil;
}
// We check if we have a valid certificate. We can have nil here coming from [[self mailAccountFolder] certificate].
// This can happen if one sends an encrypted mail, but actually never uploaded
// a PKCS#12 file to SOGo for his/her own usage and we're trying to save an encrypted
// version of the message in the current user's Sent folder
if (certificate)
content = [content encryptUsingCertificate: certificate];
content = [content encryptUsingCertificate: certificate andAlgos: algos];
}
finish_smime: