From 5b00bbd3214f3e98f977a295def4ad66eb4b556b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 27 Sep 2020 18:52:40 +0200
Subject: [PATCH] Use private key algorithm

---
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 0955c649d9..efcd257459 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2716,7 +2716,12 @@ public class FragmentCompose extends FragmentBase {
                 CMSSignedDataGenerator cmsGenerator = new CMSSignedDataGenerator();
                 cmsGenerator.addCertificates(store);
 
-                ContentSigner contentSigner = new JcaContentSignerBuilder("SHA256withRSA")
+                String algorithm = privkey.getAlgorithm();
+                Log.i("Private key algorithm=" + algorithm);
+                if (TextUtils.isEmpty(algorithm))
+                    algorithm = "RSA";
+
+                ContentSigner contentSigner = new JcaContentSignerBuilder("SHA256with" + algorithm)
                         .build(privkey);
                 DigestCalculatorProvider digestCalculator = new JcaDigestCalculatorProviderBuilder()
                         .build();