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

hotspot2: expose string constants for cert type and auth methods

Browse Source 
So that we can use these constants in WifiService and the apps
as well in the future.

While there, remove auth method "CHAP" from the supported list,
since it is currenlty not supported by WifiService.

Bug: 34206769
Test: make -j32
Change-Id: Icadc3b13f2b135d51445d336116fbba86e96b70f
This commit is contained in:
Peter Qiu
2017-02-28 15:12:16 -08:00
parent 81a28efd1b
commit f8dbd216c8
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wifi/java/android/net/wifi/hotspot2/pps/Credential.java
View File

@@ -121,13 +121,23 @@ public final class Credential implements Parcelable {
*/
private static final int MAX_PASSWORD_BYTES = 255;
/**
* Supported authentication methods.
* @hide
*/
public static final String AUTH_METHOD_PAP = "PAP";
/** @hide */
public static final String AUTH_METHOD_MSCHAP = "MS-CHAP";
/** @hide */
public static final String AUTH_METHOD_MSCHAPV2 = "MS-CHAP-V2";
/**
* Supported Non-EAP inner methods. Refer to
* Credential/UsernamePassword/EAPMethod/InnerEAPType in Hotspot 2.0 Release 2 Technical
* Specification Section 9.1 for more info.
*/
private static final Set<String> SUPPORTED_AUTH =
new HashSet<String>(Arrays.asList("PAP", "CHAP", "MS-CHAP", "MS-CHAP-V2"));
private static final Set<String> SUPPORTED_AUTH = new HashSet<String>(
Arrays.asList(AUTH_METHOD_PAP, AUTH_METHOD_MSCHAP, AUTH_METHOD_MSCHAPV2));
/**
* Username of the credential.
@@ -348,8 +358,9 @@ public final class Credential implements Parcelable {
public static final class CertificateCredential implements Parcelable {
/**
* Supported certificate types.
* @hide
*/
private static final String CERT_TYPE_X509V3 = "x509v3";
public static final String CERT_TYPE_X509V3 = "x509v3";
/**
* Certificate SHA-256 fingerprint length.