moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

Fix for Issue 1956

Browse Source 
A race condition made the outgoing certificate being compared to the old
incoming mHost,
throwing an exception with an untrusted certificate dialogue to accept
or decline.
This commit is contained in:
Jesse Vincent 2010-07-27 18:59:41 +00:00
parent 3fbdb0ff0e
commit 2ca76e3db0
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/fsck/k9/mail/store/TrustManagerFactory.java
View File

@ -17,6 +17,8 @@ import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException; import java.security.cert.CertificateException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.util.HashMap;
import java.util.Map;
public final class TrustManagerFactory public final class TrustManagerFactory
{ {
@ -52,21 +54,30 @@ public final class TrustManagerFactory
private static class SecureX509TrustManager implements X509TrustManager private static class SecureX509TrustManager implements X509TrustManager
{ {
private String mHost; private static final Map<String, SecureX509TrustManager> mTrustManager =
private static SecureX509TrustManager me; new HashMap<String, SecureX509TrustManager>();
private SecureX509TrustManager() private final String mHost;
private SecureX509TrustManager(String host)
{ {
mHost = host;
} }
public static X509TrustManager getInstance(String host) public synchronized static X509TrustManager getInstance(String host)
{ {
if (me == null) SecureX509TrustManager trustManager;
if (mTrustManager.containsKey(host))
{ {
me = new SecureX509TrustManager(); trustManager = mTrustManager.get(host);
} }
me.mHost = host; else
return me; {
trustManager = new SecureX509TrustManager(host);
mTrustManager.put(host, trustManager);
}
return trustManager;
} }
public void checkClientTrusted(X509Certificate[] chain, String authType) public void checkClientTrusted(X509Certificate[] chain, String authType)