mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-27 08:23:24 +00:00
Code Issues Releases Wiki Activity

Optional public key

Browse source
This commit is contained in:
M66B 2019-12-02 17:18:24 +01:00
parent c24ebe7381
commit dea43e7c7a
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -4363,16 +4363,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
int type = args.getInt("type");
String alias = args.getString("alias");
if (alias == null)
throw new IllegalArgumentException("Key alias missing");
DB db = DB.getInstance(context);
if (EntityMessage.SMIME_SIGNONLY.equals(type)) {
// Check public key
X509Certificate[] chain = KeyChain.getCertificateChain(context, alias);
if (chain == null || chain.length == 0)
throw new IllegalArgumentException("Public key missing");
// Get public key
PublicKey pubkey = null;
X509Certificate[] chain = null;
if (alias != null)
chain = KeyChain.getCertificateChain(context, alias);
if (chain != null && chain.length > 0)
pubkey = chain[0].getPublicKey();
// Get content/signature
File content = null;
@ -4410,15 +4410,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
Date now = new Date();
boolean valid;
try {
chain[0].checkValidity(now);
if (chain != null && chain.length > 0)
chain[0].checkValidity(now);
valid = certHolder.isValidOn(now);
} catch (CertificateException ignored) {
valid = false;
}
// Check public key
PublicKey pubkey = chain[0].getPublicKey();
if (valid &&
pubkey != null &&
signer.verify(new JcaSimpleSignerInfoVerifierBuilder().build(pubkey)))
return true;
else
@ -4428,6 +4429,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
return false;
} else {
if (alias == null)
throw new IllegalArgumentException("Key alias missing");
// Check private key
PrivateKey privkey = KeyChain.getPrivateKey(context, alias);
if (privkey == null)