use POSH only when system CAs are trusted

Daniel Gultsch created 9 years ago

Change summary

libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingTrustManager.java | 4 
1 file changed, 3 insertions(+), 1 deletion(-)

Detailed changes

libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingTrustManager.java

@@ -36,6 +36,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.SystemClock;
+import android.preference.PreferenceManager;
 import android.util.Base64;
 import android.util.Log;
 import android.util.SparseArray;
@@ -430,7 +431,8 @@ public class MemorizingTrustManager {
 				else
 					defaultTrustManager.checkClientTrusted(chain, authType);
 			} catch (CertificateException e) {
-				if (domain != null && isServer && !isIp(domain)) {
+				boolean trustSystemCAs = !PreferenceManager.getDefaultSharedPreferences(master).getBoolean("dont_trust_system_cas", false);
+				if (domain != null && isServer && trustSystemCAs && !isIp(domain)) {
 					String hash = getBase64Hash(chain[0],"SHA-256");
 					List<String> fingerprints = getPoshFingerprints(domain);
 					if (hash != null && fingerprints.contains(hash)) {