Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f3e3a7fd: am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey to PrivateKey."

Browse Source 
* commit 'f3e3a7fd3cc386b69ae3275b829ddd0d137fcac5':
  Switch TLS Channel ID API from ECPrivateKey to PrivateKey.
This commit is contained in:
Kenny Root
2013-03-12 13:27:13 -07:00
committed by Android Git Automerger
parent faa4bea4c0 f3e3a7fd3c
commit ae19d2cac8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/SSLCertificateSocketFactory.java
View File

@@ -23,8 +23,8 @@ import java.net.InetAddress;
import java.net.Socket; import java.net.Socket;
import java.net.SocketException; import java.net.SocketException;
import java.security.KeyManagementException; import java.security.KeyManagementException;
import java.security.PrivateKey;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
import java.security.interfaces.ECPrivateKey;
import javax.net.SocketFactory; import javax.net.SocketFactory;
import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.HttpsURLConnection;
@@ -89,7 +89,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
private TrustManager[] mTrustManagers = null; private TrustManager[] mTrustManagers = null;
private KeyManager[] mKeyManagers = null; private KeyManager[] mKeyManagers = null;
private byte[] mNpnProtocols = null; private byte[] mNpnProtocols = null;
private ECPrivateKey mChannelIdPrivateKey = null; private PrivateKey mChannelIdPrivateKey = null;
private final int mHandshakeTimeoutMillis; private final int mHandshakeTimeoutMillis;
private final SSLClientSessionCache mSessionCache; private final SSLClientSessionCache mSessionCache;
@@ -321,7 +321,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
} }
/** /**
* Sets the {@link ECPrivateKey} to be used for TLS Channel ID by connections made by this * Sets the private key to be used for TLS Channel ID by connections made by this
* factory. * factory.
* *
* @param privateKey private key (enables TLS Channel ID) or {@code null} for no key (disables * @param privateKey private key (enables TLS Channel ID) or {@code null} for no key (disables
@@ -330,7 +330,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
* *
* @hide * @hide
*/ */
public void setChannelIdPrivateKey(ECPrivateKey privateKey) { public void setChannelIdPrivateKey(PrivateKey privateKey) {
mChannelIdPrivateKey = privateKey; mChannelIdPrivateKey = privateKey;
} }