From f97ac83a89409dbc2501f02df32029f2d7ad4b1b Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Wed, 25 Jun 2014 00:37:01 +0200
Subject: Move sks-keyservers.net CA into assets folder

---
 .../sufficientlysecure/keychain/keyimport/HkpKeyserver.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
index b048a2cea..44679ba18 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
@@ -188,12 +188,10 @@ public class HkpKeyserver extends Keyserver {
 
     private HttpURLConnection openConnection(URL url) throws IOException {
         HttpURLConnection conn = null;
-        if (mHost.endsWith("pool.sks-keyservers.net") && mSecure) {
-            try {
-                conn = TlsHelper.openCAConnection(Constants.SKS_KEYSERVERS_NET_CA.getBytes(), url);
-            } catch (TlsHelper.TlsHelperException e) {
-                Log.w(Constants.TAG, e);
-            }
+        try {
+            conn = (HttpURLConnection) TlsHelper.openConnection(url);
+        } catch (TlsHelper.TlsHelperException e) {
+            Log.w(Constants.TAG, e);
         }
         if (conn == null) {
             conn = (HttpURLConnection) url.openConnection();
-- 
cgit v1.2.3