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

Merge "Remove android.net.PskKeyManager"

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-28 08:09:34 +00:00
committed by Android (Google) Code Review
parent d25cf29ee6 5e86d951a7
commit 0820881132
7 changed files with 23 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/current.txt
View File

@@ -23897,19 +23897,6 @@ package android.net {
field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR;
}
public abstract class PskKeyManager {
ctor public PskKeyManager();
method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);
method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);
method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);
method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);
method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);
method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);
field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
}
public final class RouteInfo implements android.os.Parcelable {
method public int describeContents();
method public android.net.IpPrefix getDestination();

7
api/removed.txt
View File

@@ -167,6 +167,13 @@ package android.media.tv {
package android.net {
public abstract class PskKeyManager {
ctor public PskKeyManager();
field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
}
public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {
method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
}

13
api/system-current.txt
View File

@@ -25756,19 +25756,6 @@ package android.net {
field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR;
}
public abstract class PskKeyManager {
ctor public PskKeyManager();
method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);
method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);
method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);
method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);
method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);
method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);
field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
}
public final class RouteInfo implements android.os.Parcelable {
method public int describeContents();
method public android.net.IpPrefix getDestination();

7
api/system-removed.txt
View File

@@ -165,6 +165,13 @@ package android.media.tv {
package android.net {
public abstract class PskKeyManager {
ctor public PskKeyManager();
field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
}
public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {
method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
}

13
api/test-current.txt
View File

@@ -23970,19 +23970,6 @@ package android.net {
field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR;
}
public abstract class PskKeyManager {
ctor public PskKeyManager();
method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);
method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);
method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);
method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);
method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);
method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);
field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
}
public final class RouteInfo implements android.os.Parcelable {
method public int describeContents();
method public android.net.IpPrefix getDestination();

7
api/test-removed.txt
View File

@@ -167,6 +167,13 @@ package android.media.tv {
package android.net {
public abstract class PskKeyManager {
ctor public PskKeyManager();
field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
}
public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {
method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);
}

2
core/java/android/net/PskKeyManager.java
View File

@@ -104,6 +104,8 @@ import javax.net.ssl.SSLEngine;
*
* SSLSocket sslSocket = (SSLSocket) sslContext.getSocketFactory().createSocket(...);
* }</pre>
*
* @removed This class is removed because it does not work with TLS 1.3.
*/
public abstract class PskKeyManager implements PSKKeyManager {
// IMPLEMENTATION DETAILS: This class exists only because the default implemenetation of the