From ac5eb03a7c317e21573155b88641f4f1daef2eb9 Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Tue, 12 Mar 2013 10:30:59 -0700 Subject: Switch TLS Channel ID API from ECPrivateKey to PrivateKey. This is to accept both the "transparent" and "opaque" ECC private keys. "Transparent" keys provide structured access to their key material -- these are instances of ECPrivateKey. "Opaque" private keys are not required to provide structured (or even any) access to their key material -- these are instances of PrivateKey. Change-Id: Ib22e18b45b638b429f994ed965416c753226c4ee --- core/java/android/net/SSLCertificateSocketFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index c0a894b..2a2f7cf 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -23,8 +23,8 @@ import java.net.InetAddress; import java.net.Socket; import java.net.SocketException; import java.security.KeyManagementException; +import java.security.PrivateKey; import java.security.cert.X509Certificate; -import java.security.interfaces.ECPrivateKey; import javax.net.SocketFactory; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; @@ -89,7 +89,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { private TrustManager[] mTrustManagers = null; private KeyManager[] mKeyManagers = null; private byte[] mNpnProtocols = null; - private ECPrivateKey mChannelIdPrivateKey = null; + private PrivateKey mChannelIdPrivateKey = null; private final int mHandshakeTimeoutMillis; 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. * * @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 */ - public void setChannelIdPrivateKey(ECPrivateKey privateKey) { + public void setChannelIdPrivateKey(PrivateKey privateKey) { mChannelIdPrivateKey = privateKey; } -- cgit v1.1