moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-27 19:22:15 -05:00
Code Issues Releases Wiki Activity

made OF selfSigned() workaround only available >=kitkat

Browse Source 
this undos 8a729061d5. as it turns out 4.1
and 4.0 only break when checking if a cert is self signed.
This commit is contained in:
Daniel Gultsch 2017-07-23 07:47:36 +02:00
parent 58f3787795
commit c8bd5bc1f5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/crypto/XmppDomainVerifier.java
View File

@ -43,10 +43,9 @@ public class XmppDomainVerifier implements DomainHostnameVerifier {
} }
X509Certificate certificate = (X509Certificate) chain[0]; X509Certificate certificate = (X509Certificate) chain[0];
final List<String> commonNames = getCommonNames(certificate); final List<String> commonNames = getCommonNames(certificate);
final boolean isSelfSignedCertificate = isSelfSigned(certificate); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && isSelfSigned(certificate)) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT || isSelfSignedCertificate) { if (commonNames.size() == 1 && matchDomain(domain,commonNames)) {
if (commonNames.size() == 1 && commonNames.get(0).equals(domain)) { Log.d(LOGTAG,"accepted CN in self signed cert as work around for "+domain);
Log.d(LOGTAG,"accepted CN in cert as work around for "+domain+" isSelfSigned="+Boolean.toString(isSelfSignedCertificate)+", sdkInt="+Build.VERSION.SDK_INT);
return true; return true;
} }
} }