summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-05-17 14:57:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-17 14:57:30 -0700
commit0162c72d58f1683cf0be369709de2450daab375c (patch)
tree5c84d8f38221d5e3241e75df2644d77ce61d98f8
parentb228c6d62c9e91e980067a07e874e418bde4d75b (diff)
parentdfe69fa450bb1c92c589e703c6dc72aa0e364bb3 (diff)
downloadlibcore-0162c72d58f1683cf0be369709de2450daab375c.zip
libcore-0162c72d58f1683cf0be369709de2450daab375c.tar.gz
libcore-0162c72d58f1683cf0be369709de2450daab375c.tar.bz2
Merge "Simplify KeyChain API by removing now unneeded CA certificate lookup (2 of 3)"
-rw-r--r--luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java6
-rw-r--r--luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java4
2 files changed, 0 insertions, 10 deletions
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java
index 948c625..7578550 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/SSLParametersImpl.java
@@ -422,10 +422,4 @@ public class SSLParametersImpl implements Cloneable {
}
return null;
}
-
- public static IndexedPKIXParameters getDefaultIndexedPKIXParameters() {
- TrustManagerImpl tm = (TrustManagerImpl) getDefaultTrustManager();
- return tm.getIndexedPKIXParameters();
- }
-
}
diff --git a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
index 2a56618..99a154d 100644
--- a/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
+++ b/luni/src/main/java/org/apache/harmony/xnet/provider/jsse/TrustManagerImpl.java
@@ -73,10 +73,6 @@ public final class TrustManagerImpl implements X509TrustManager {
private final Exception err;
private final CertificateFactory factory;
- public final IndexedPKIXParameters getIndexedPKIXParameters() {
- return params;
- }
-
/**
* Creates X509TrustManager based on a keystore
*