Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-27 11:25:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use subject CN as DNS name"

Browse Source 
This reverts commit 0d9f00f366.
This commit is contained in:
M66B
2022-06-03 17:35:18 +02:00
parent 0d9f00f366
commit 709461d2e2
1 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/eu/faircode/email/EntityCertificate.java
View File

@@ -218,39 +218,23 @@ public class EntityCertificate {
List<String> result = new ArrayList<>();
Collection<List<?>> altNames = certificate.getSubjectAlternativeNames();
if (altNames != null)
for (List altName : altNames)
try {
if (altName.get(0).equals(GeneralName.dNSName))
result.add((String) altName.get(1));
else if (altName.get(0).equals(GeneralName.iPAddress))
if (altName.get(1) instanceof String)
result.add((String) altName.get(1));
else {
Object val = altName.get(1);
Log.e("GeneralName.iPAddress type=" + (val == null ? null : val.getClass()));
}
} catch (Throwable ex) {
Log.e(ex);
}
if (altNames == null)
return result;
try {
X500Name name = new JcaX509CertificateHolder(certificate).getSubject();
if (name != null)
for (RDN rdn : name.getRDNs(BCStyle.CN))
for (AttributeTypeAndValue tv : rdn.getTypesAndValues()) {
ASN1Encodable enc = tv.getValue();
if (enc == null)
continue;
String cn = enc.toString();
if (TextUtils.isEmpty(cn))
continue;
if (!result.contains(cn))
result.add(cn);
for (List altName : altNames)
try {
if (altName.get(0).equals(GeneralName.dNSName))
result.add((String) altName.get(1));
else if (altName.get(0).equals(GeneralName.iPAddress))
if (altName.get(1) instanceof String)
result.add((String) altName.get(1));
else {
Object val = altName.get(1);
Log.e("GeneralName.iPAddress type=" + (val == null ? null : val.getClass()));
}
} catch (Throwable ex) {
Log.e(ex);
}
} catch (Throwable ex) {
Log.e(ex);
}
return result;
}