diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-21 11:49:12 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-21 11:49:12 +0200 |
| commit | 2b83ed6cfc08c32483b42a47c1962d44f8c5b434 (patch) | |
| tree | e2e8fad9380840eea8d1723e44658c71b9d41642 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport | |
| parent | d8f664bd179e76c2b9eb9fda4ffc3254a1ded067 (diff) | |
| parent | 0b181743a3d6b1423e112b17a400b5ac4ac09bcb (diff) | |
| download | open-keychain-2b83ed6cfc08c32483b42a47c1962d44f8c5b434.tar.gz open-keychain-2b83ed6cfc08c32483b42a47c1962d44f8c5b434.tar.bz2 open-keychain-2b83ed6cfc08c32483b42a47c1962d44f8c5b434.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java | 6 |
1 files changed, 5 insertions, 1 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 558b8ce7d..5683decdf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java @@ -204,11 +204,15 @@ public class HkpKeyserver extends Keyserver { OkHttpClient client = new OkHttpClient(); try { - TlsHelper.pinCertificateIfNecessary(client, url); + TlsHelper.usePinnedCertificateIfAvailable(client, url); } catch (TlsHelper.TlsHelperException e) { Log.w(Constants.TAG, e); } + // don't follow any redirects + client.setFollowRedirects(false); + client.setFollowSslRedirects(false); + if (proxy != null) { client.setProxy(proxy); client.setConnectTimeout(30000, TimeUnit.MILLISECONDS); |