diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-16 14:36:18 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
commit | 2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8 (patch) | |
tree | 3b6e9eb10f21be97e94582616e309c230ae5f327 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java | |
parent | f6d0f88ac973328b3b7a9d426214beb76efefb3f (diff) | |
download | open-keychain-2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8.tar.gz open-keychain-2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8.tar.bz2 open-keychain-2402c6d3c72b19b8eded017ff3fbeb83c30ae0a8.zip |
ensuring code style is preserved
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java index 58c250cab..d1d1ada2a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/TlsHelper.java @@ -27,7 +27,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.net.URLConnection; import java.security.KeyManagementException; import java.security.KeyStore; import java.security.KeyStoreException; @@ -62,7 +61,7 @@ public class TlsHelper { ByteArrayOutputStream baos = new ByteArrayOutputStream(); int reads = is.read(); - while(reads != -1){ + while (reads != -1) { baos.write(reads); reads = is.read(); } @@ -75,17 +74,6 @@ public class TlsHelper { } } - public static URLConnection opeanConnection(URL url) throws IOException, TlsHelperException { - if (url.getProtocol().equals("https")) { - for (String domain : sStaticCA.keySet()) { - if (url.getHost().endsWith(domain)) { - return openCAConnection(sStaticCA.get(domain), url); - } - } - } - return url.openConnection(); - } - public static void pinCertificateIfNecessary(OkHttpClient client, URL url) throws TlsHelperException, IOException { if (url.getProtocol().equals("https")) { for (String domain : sStaticCA.keySet()) { @@ -103,7 +91,7 @@ public class TlsHelper { * TODO: Refactor - More like SSH StrictHostKeyChecking than pinning? * * @param certificate certificate to pin - * @param client OkHttpClient to enforce pinning on + * @param client OkHttpClient to enforce pinning on * @throws TlsHelperException * @throws IOException */ |