aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
diff options
context:
space:
mode:
authorAdithya Abraham Philip <adithyaphilip@gmail.com>2015-06-07 21:44:15 +0530
committerAdithya Abraham Philip <adithyaphilip@gmail.com>2015-07-03 20:46:15 +0530
commit731ec3382ef8df566e56061c25ffc0b292521e20 (patch)
tree6196da2aca9487074bc2b0182ad226672e8bdba6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport
parent25d07d173c9b4d8da9e1596ea6286047fa8f111e (diff)
downloadopen-keychain-731ec3382ef8df566e56061c25ffc0b292521e20.tar.gz
open-keychain-731ec3382ef8df566e56061c25ffc0b292521e20.tar.bz2
open-keychain-731ec3382ef8df566e56061c25ffc0b292521e20.zip
fixed certificate pinning
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java9
1 files changed, 5 insertions, 4 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 f18878bb5..da1494ce3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/HkpKeyserver.java
@@ -193,7 +193,7 @@ public class HkpKeyserver extends Keyserver {
private HttpURLConnection openConnectioan(URL url) throws IOException {
HttpURLConnection conn = null;
try {
- conn = (HttpURLConnection) TlsHelper.openConnection(url);
+ conn = (HttpURLConnection) TlsHelper.opeanConnection(url);
} catch (TlsHelper.TlsHelperException e) {
Log.w(Constants.TAG, e);
}
@@ -212,7 +212,7 @@ public class HkpKeyserver extends Keyserver {
* @param proxy
* @return
*/
- private OkHttpClient getClient(URL url, Proxy proxy) {
+ public static OkHttpClient getClient(URL url, Proxy proxy) throws IOException {
OkHttpClient client = new OkHttpClient();
try {
@@ -222,7 +222,7 @@ public class HkpKeyserver extends Keyserver {
}
client.setProxy(proxy);
- // TODO: if proxy !=null increase timeout?
+ // TODO: PHILIP if proxy !=null increase timeout?
client.setConnectTimeout(5000, TimeUnit.MILLISECONDS);
client.setReadTimeout(25000, TimeUnit.MILLISECONDS);
@@ -244,6 +244,7 @@ public class HkpKeyserver extends Keyserver {
throw new HttpError(response.code(), responseBody);
}
} catch (IOException e) {
+ e.printStackTrace();
throw new QueryFailedException("Keyserver '" + mHost + "' is unavailable. Check your Internet connection!");
}
}
@@ -421,7 +422,7 @@ public class HkpKeyserver extends Keyserver {
* Tries to find a server responsible for a given domain
*
* @return A responsible Keyserver or null if not found.
- * TODO: Add proxy functionality
+ * TODO: PHILIP Add proxy functionality
*/
public static HkpKeyserver resolve(String domain) {
try {