Merge pull request #361 from haiwen/fix-handling-certs-chain

fixed a issue when handling certificates chain
haiwen · Jun 4, 2015 · d85b6a6 · d85b6a6
2 parents 2922515 + 01a8f78
commit d85b6a6
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/com/seafile/seadroid2/SSLTrustManager.java b/src/com/seafile/seadroid2/SSLTrustManager.java
@@ -11,18 +11,23 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
-import javax.net.ssl.*;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
+import org.apache.http.conn.ssl.X509HostnameVerifier;
 
-import android.os.Build;
 import android.util.Log;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import com.seafile.seadroid2.account.Account;
-import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
 
 public final class SSLTrustManager {
     public enum SslFailureReason {
@@ -145,7 +150,9 @@ public List<X509Certificate> orderCerts(X509Certificate[] certificates) {
             return ImmutableList.of();
         }
 
-        List<X509Certificate> certs = Lists.newArrayList(certificates);
+        Set<X509Certificate> all = Sets.newHashSet(certificates);
+
+        List<X509Certificate> certs = Lists.newArrayList(all);
         // certs.addAll(Arrays.asList(certificates));
         X509Certificate certChain = certs.get(0);
         certs.remove(certChain);