aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
diff options
context:
space:
mode:
authormar-v-in <github@rvin.mooo.com>2014-06-25 00:37:01 +0200
committermar-v-in <github@rvin.mooo.com>2014-06-25 00:37:01 +0200
commitf97ac83a89409dbc2501f02df32029f2d7ad4b1b (patch)
treef2077198e441350d5ee8f321257959582c16374b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
parent997faac90e2d002af1b5f45ef1893b118231b656 (diff)
downloadopen-keychain-f97ac83a89409dbc2501f02df32029f2d7ad4b1b.tar.gz
open-keychain-f97ac83a89409dbc2501f02df32029f2d7ad4b1b.tar.bz2
open-keychain-f97ac83a89409dbc2501f02df32029f2d7ad4b1b.zip
Move sks-keyservers.net CA into assets folder
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java10
1 files changed, 4 insertions, 6 deletions
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();