Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-03 23:56:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

S/MIME EC fix

Browse Source
This commit is contained in:
M66B
2025-10-02 16:38:23 +02:00
parent e3be7c8922
commit 5dd76576fb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -4727,7 +4727,8 @@ public class FragmentCompose extends FragmentBase {
chain[0].getPublicKey(),
CMSAlgorithm.AES128_WRAP);
for (X509Certificate cert : certs)
gen.addRecipient(cert);
if (SmimeHelper.match(privkey, cert))
gen.addRecipient(cert);
cmsEnvelopedDataGenerator.addRecipientInfoGenerator(gen);
// https://security.stackexchange.com/a/53960
// https://stackoverflow.com/questions/7073319/
@@ -4763,6 +4764,7 @@ public class FragmentCompose extends FragmentBase {
Log.i("S/MIME selected encryption algo=" + encryptAlgorithm + " OID=" + encryptionOID);
OutputEncryptor encryptor = new JceCMSContentEncryptorBuilder(encryptionOID)
.setEnableSha256HKdf(true)
.build();
CMSEnvelopedData cmsEnvelopedData = cmsEnvelopedDataGenerator
.generate(msg, encryptor);