Wifi: add WAPI constants and fields (3c21193f) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −0

api/system-current.txt

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5542,6 +5542,11 @@ package android.net.wifi {
	field @Deprecated public byte id;		field @Deprecated public byte id;
	}		}

			public class ScanResult implements android.os.Parcelable {
			field public static final int KEY_MGMT_WAPI_CERT = 14; // 0xe
			field public static final int KEY_MGMT_WAPI_PSK = 13; // 0xd
			}

	public final class SoftApConfiguration implements android.os.Parcelable {		public final class SoftApConfiguration implements android.os.Parcelable {
	method public int describeContents();		method public int describeContents();
	method public int getBand();		method public int getBand();
	@@ -5639,6 +5644,8 @@ package android.net.wifi {
	}		}

	@Deprecated public static class WifiConfiguration.KeyMgmt {		@Deprecated public static class WifiConfiguration.KeyMgmt {
			field @Deprecated public static final int WAPI_CERT = 14; // 0xe
			field @Deprecated public static final int WAPI_PSK = 13; // 0xd
	field @Deprecated public static final int WPA2_PSK = 4; // 0x4		field @Deprecated public static final int WPA2_PSK = 4; // 0x4
	}		}

	@@ -5675,10 +5682,12 @@ package android.net.wifi {
	method @NonNull public String getCaPath();		method @NonNull public String getCaPath();
	method @NonNull public String getClientCertificateAlias();		method @NonNull public String getClientCertificateAlias();
	method public int getOcsp();		method public int getOcsp();
			method @Nullable public String getWapiCertSuite();
	method public void setCaCertificateAliases(@Nullable String[]);		method public void setCaCertificateAliases(@Nullable String[]);
	method public void setCaPath(@Nullable String);		method public void setCaPath(@Nullable String);
	method public void setClientCertificateAlias(@Nullable String);		method public void setClientCertificateAlias(@Nullable String);
	method public void setOcsp(int);		method public void setOcsp(int);
			method public void setWapiCertSuite(@Nullable String);
	field public static final int OCSP_NONE = 0; // 0x0		field public static final int OCSP_NONE = 0; // 0x0
	field public static final int OCSP_REQUEST_CERT_STATUS = 1; // 0x1		field public static final int OCSP_REQUEST_CERT_STATUS = 1; // 0x1
	field public static final int OCSP_REQUIRE_ALL_NON_TRUSTED_CERTS_STATUS = 3; // 0x3		field public static final int OCSP_REQUIRE_ALL_NON_TRUSTED_CERTS_STATUS = 3; // 0x3

wifi/java/android/net/wifi/ScanResult.java

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -101,6 +101,12 @@ public class ScanResult implements Parcelable {
	*/		*/
	public static final int PROTOCOL_OSEN = 3;		public static final int PROTOCOL_OSEN = 3;

			/**
			* @hide
			* Security protocol type: WAPI.
			*/
			public static final int PROTOCOL_WAPI = 4;

	/**		/**
	* @hide		* @hide
	* No security key management scheme.		* No security key management scheme.
	@@ -167,6 +173,18 @@ public class ScanResult implements Parcelable {
	* Security key management scheme: OWE in transition mode.		* Security key management scheme: OWE in transition mode.
	*/		*/
	public static final int KEY_MGMT_OWE_TRANSITION = 12;		public static final int KEY_MGMT_OWE_TRANSITION = 12;
			/**
			* @hide
			* Security key management scheme: WAPI_PSK.
			*/
			@SystemApi
			public static final int KEY_MGMT_WAPI_PSK = 13;
			/**
			* @hide
			* Security key management scheme: WAPI_CERT.
			*/
			@SystemApi
			public static final int KEY_MGMT_WAPI_CERT = 14;
	/**		/**
	* @hide		* @hide
	* No cipher suite.		* No cipher suite.
	@@ -192,6 +210,11 @@ public class ScanResult implements Parcelable {
	* Cipher suite: GCMP		* Cipher suite: GCMP
	*/		*/
	public static final int CIPHER_GCMP_256 = 4;		public static final int CIPHER_GCMP_256 = 4;
			/**
			* @hide
			* Cipher suite: SMS4
			*/
			public static final int CIPHER_SMS4 = 5;

	/**		/**
	* The detected signal level in dBm, also known as the RSSI.		* The detected signal level in dBm, also known as the RSSI.

wifi/java/android/net/wifi/WifiConfiguration.java

+63 −6

Original line number	Original line	Diff line number	Diff line
	@@ -123,7 +123,9 @@ public class WifiConfiguration implements Parcelable {
	OWE,		OWE,
	SUITE_B_192,		SUITE_B_192,
	WPA_PSK_SHA256,		WPA_PSK_SHA256,
	WPA_EAP_SHA256})		WPA_EAP_SHA256,
			WAPI_PSK,
			WAPI_CERT})
	public @interface KeyMgmtScheme {}		public @interface KeyMgmtScheme {}

	/** WPA is not used; plaintext or static WEP could be used. */		/** WPA is not used; plaintext or static WEP could be used. */
	@@ -190,11 +192,26 @@ public class WifiConfiguration implements Parcelable {
	*/		*/
	public static final int WPA_EAP_SHA256 = 12;		public static final int WPA_EAP_SHA256 = 12;

			/**
			* WAPI pre-shared key (requires {@code preSharedKey} to be specified).
			* @hide
			*/
			@SystemApi
			public static final int WAPI_PSK = 13;

			/**
			* WAPI certificate to be specified.
			* @hide
			*/
			@SystemApi
			public static final int WAPI_CERT = 14;

	public static final String varName = "key_mgmt";		public static final String varName = "key_mgmt";

	public static final String[] strings = { "NONE", "WPA_PSK", "WPA_EAP",		public static final String[] strings = { "NONE", "WPA_PSK", "WPA_EAP",
	"IEEE8021X", "WPA2_PSK", "OSEN", "FT_PSK", "FT_EAP",		"IEEE8021X", "WPA2_PSK", "OSEN", "FT_PSK", "FT_EAP",
	"SAE", "OWE", "SUITE_B_192", "WPA_PSK_SHA256", "WPA_EAP_SHA256" };		"SAE", "OWE", "SUITE_B_192", "WPA_PSK_SHA256", "WPA_EAP_SHA256",
			"WAPI_PSK", "WAPI_CERT" };
	}		}

	/**		/**
	@@ -215,9 +232,14 @@ public class WifiConfiguration implements Parcelable {
	*/		*/
	public static final int OSEN = 2;		public static final int OSEN = 2;

			/**
			* WAPI Protocol
			*/
			public static final int WAPI = 3;

	public static final String varName = "proto";		public static final String varName = "proto";

	public static final String[] strings = { "WPA", "RSN", "OSEN" };		public static final String[] strings = { "WPA", "RSN", "OSEN", "WAPI" };
	}		}

	/**		/**
	@@ -260,10 +282,14 @@ public class WifiConfiguration implements Parcelable {
	* AES in Galois/Counter Mode		* AES in Galois/Counter Mode
	*/		*/
	public static final int GCMP_256 = 3;		public static final int GCMP_256 = 3;
			/**
			* SMS4 cipher for WAPI
			*/
			public static final int SMS4 = 4;

	public static final String varName = "pairwise";		public static final String varName = "pairwise";

	public static final String[] strings = { "NONE", "TKIP", "CCMP", "GCMP_256" };		public static final String[] strings = { "NONE", "TKIP", "CCMP", "GCMP_256", "SMS4" };
	}		}

	/**		/**
	@@ -301,12 +327,17 @@ public class WifiConfiguration implements Parcelable {
	* AES in Galois/Counter Mode		* AES in Galois/Counter Mode
	*/		*/
	public static final int GCMP_256 = 5;		public static final int GCMP_256 = 5;
			/**
			* SMS4 cipher for WAPI
			*/
			public static final int SMS4 = 6;

	public static final String varName = "group";		public static final String varName = "group";

	public static final String[] strings =		public static final String[] strings =
	{ /* deprecated / "WEP40", / deprecated */ "WEP104",		{ /* deprecated / "WEP40", / deprecated */ "WEP104",
	"TKIP", "CCMP", "GTK_NOT_USED", "GCMP_256" };		"TKIP", "CCMP", "GTK_NOT_USED", "GCMP_256",
			"SMS4" };
	}		}

	/**		/**
	@@ -388,6 +419,10 @@ public class WifiConfiguration implements Parcelable {
	public static final int SECURITY_TYPE_EAP_SUITE_B = 5;		public static final int SECURITY_TYPE_EAP_SUITE_B = 5;
	/** @hide */		/** @hide */
	public static final int SECURITY_TYPE_OWE = 6;		public static final int SECURITY_TYPE_OWE = 6;
			/** @hide */
			public static final int SECURITY_TYPE_WAPI_PSK = 7;
			/** @hide */
			public static final int SECURITY_TYPE_WAPI_CERT = 8;

	/** @hide */		/** @hide */
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@@ -398,7 +433,9 @@ public class WifiConfiguration implements Parcelable {
	SECURITY_TYPE_EAP,		SECURITY_TYPE_EAP,
	SECURITY_TYPE_SAE,		SECURITY_TYPE_SAE,
	SECURITY_TYPE_EAP_SUITE_B,		SECURITY_TYPE_EAP_SUITE_B,
	SECURITY_TYPE_OWE		SECURITY_TYPE_OWE,
			SECURITY_TYPE_WAPI_PSK,
			SECURITY_TYPE_WAPI_CERT
	})		})
	public @interface SecurityType {}		public @interface SecurityType {}

	@@ -450,6 +487,18 @@ public class WifiConfiguration implements Parcelable {
	allowedKeyManagement.set(WifiConfiguration.KeyMgmt.OWE);		allowedKeyManagement.set(WifiConfiguration.KeyMgmt.OWE);
	requirePMF = true;		requirePMF = true;
	break;		break;
			case SECURITY_TYPE_WAPI_PSK:
			allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WAPI_PSK);
			allowedProtocols.set(WifiConfiguration.Protocol.WAPI);
			allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.SMS4);
			allowedGroupCiphers.set(WifiConfiguration.GroupCipher.SMS4);
			break;
			case SECURITY_TYPE_WAPI_CERT:
			allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WAPI_CERT);
			allowedProtocols.set(WifiConfiguration.Protocol.WAPI);
			allowedPairwiseCiphers.set(WifiConfiguration.PairwiseCipher.SMS4);
			allowedGroupCiphers.set(WifiConfiguration.GroupCipher.SMS4);
			break;
	default:		default:
	throw new IllegalArgumentException("unknown security type " + securityType);		throw new IllegalArgumentException("unknown security type " + securityType);
	}		}
	@@ -2350,6 +2399,10 @@ public class WifiConfiguration implements Parcelable {
	return KeyMgmt.OWE;		return KeyMgmt.OWE;
	} else if (allowedKeyManagement.get(KeyMgmt.SUITE_B_192)) {		} else if (allowedKeyManagement.get(KeyMgmt.SUITE_B_192)) {
	return KeyMgmt.SUITE_B_192;		return KeyMgmt.SUITE_B_192;
			} else if (allowedKeyManagement.get(KeyMgmt.WAPI_PSK)) {
			return KeyMgmt.WAPI_PSK;
			} else if (allowedKeyManagement.get(KeyMgmt.WAPI_CERT)) {
			return KeyMgmt.WAPI_CERT;
	}		}
	return KeyMgmt.NONE;		return KeyMgmt.NONE;
	}		}
	@@ -2388,6 +2441,10 @@ public class WifiConfiguration implements Parcelable {
	key = SSID + KeyMgmt.strings[KeyMgmt.SAE];		key = SSID + KeyMgmt.strings[KeyMgmt.SAE];
	} else if (allowedKeyManagement.get(KeyMgmt.SUITE_B_192)) {		} else if (allowedKeyManagement.get(KeyMgmt.SUITE_B_192)) {
	key = SSID + KeyMgmt.strings[KeyMgmt.SUITE_B_192];		key = SSID + KeyMgmt.strings[KeyMgmt.SUITE_B_192];
			} else if (allowedKeyManagement.get(KeyMgmt.WAPI_PSK)) {
			key = SSID + KeyMgmt.strings[KeyMgmt.WAPI_PSK];
			} else if (allowedKeyManagement.get(KeyMgmt.WAPI_CERT)) {
			key = SSID + KeyMgmt.strings[KeyMgmt.WAPI_CERT];
	} else {		} else {
	key = SSID + KeyMgmt.strings[KeyMgmt.NONE];		key = SSID + KeyMgmt.strings[KeyMgmt.NONE];
	}		}

wifi/java/android/net/wifi/WifiEnterpriseConfig.java

+66 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,36 @@ import java.util.Map;
	*/		*/
	public class WifiEnterpriseConfig implements Parcelable {		public class WifiEnterpriseConfig implements Parcelable {

			/** Key prefix for WAPI AS certificates. */
			public static final String WAPI_AS_CERTIFICATE = "WAPIAS_";

			/** Key prefix for WAPI user certificates. */
			public static final String WAPI_USER_CERTIFICATE = "WAPIUSR_";

			/**
			* Intent extra: name for WAPI AS certificates
			*/
			public static final String EXTRA_WAPI_AS_CERTIFICATE_NAME =
			"android.net.wifi.extra.WAPI_AS_CERTIFICATE_NAME";

			/**
			* Intent extra: data for WAPI AS certificates
			*/
			public static final String EXTRA_WAPI_AS_CERTIFICATE_DATA =
			"android.net.wifi.extra.WAPI_AS_CERTIFICATE_DATA";

			/**
			* Intent extra: name for WAPI AS certificates
			*/
			public static final String EXTRA_WAPI_USER_CERTIFICATE_NAME =
			"android.net.wifi.extra.WAPI_USER_CERTIFICATE_NAME";

			/**
			* Intent extra: data for WAPI AS certificates
			*/
			public static final String EXTRA_WAPI_USER_CERTIFICATE_DATA =
			"android.net.wifi.extra.WAPI_USER_CERTIFICATE_DATA";

	/** @hide */		/** @hide */
	public static final String EMPTY_VALUE = "NULL";		public static final String EMPTY_VALUE = "NULL";
	/** @hide */		/** @hide */
	@@ -61,6 +91,7 @@ public class WifiEnterpriseConfig implements Parcelable {
	public static final String DOM_SUFFIX_MATCH_KEY = "domain_suffix_match";		public static final String DOM_SUFFIX_MATCH_KEY = "domain_suffix_match";
	/** @hide */		/** @hide */
	public static final String OPP_KEY_CACHING = "proactive_key_caching";		public static final String OPP_KEY_CACHING = "proactive_key_caching";

	/**		/**
	* String representing the keystore OpenSSL ENGINE's ID.		* String representing the keystore OpenSSL ENGINE's ID.
	* @hide		* @hide
	@@ -130,6 +161,8 @@ public class WifiEnterpriseConfig implements Parcelable {
	public static final String PLMN_KEY = "plmn";		public static final String PLMN_KEY = "plmn";
	/** @hide */		/** @hide */
	public static final String CA_CERT_ALIAS_DELIMITER = " ";		public static final String CA_CERT_ALIAS_DELIMITER = " ";
			/** @hide */
			public static final String WAPI_CERT_SUITE_KEY = "wapi_cert_suite";

	/**		/**
	* Do not use OCSP stapling (TLS certificate status extension)		* Do not use OCSP stapling (TLS certificate status extension)
	@@ -348,9 +381,12 @@ public class WifiEnterpriseConfig implements Parcelable {
	public static final int AKA_PRIME = 6;		public static final int AKA_PRIME = 6;
	/** Hotspot 2.0 r2 OSEN */		/** Hotspot 2.0 r2 OSEN */
	public static final int UNAUTH_TLS = 7;		public static final int UNAUTH_TLS = 7;
			/** WAPI Certificate */
			public static final int WAPI_CERT = 8;
	/** @hide */		/** @hide */
	public static final String[] strings =		public static final String[] strings =
	{ "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA", "AKA'", "WFA-UNAUTH-TLS" };		{ "PEAP", "TLS", "TTLS", "PWD", "SIM", "AKA", "AKA'", "WFA-UNAUTH-TLS",
			"WAPI_CERT" };

	/** Prevent initialization */		/** Prevent initialization */
	private Eap() {}		private Eap() {}
	@@ -494,6 +530,10 @@ public class WifiEnterpriseConfig implements Parcelable {
	public void setEapMethod(int eapMethod) {		public void setEapMethod(int eapMethod) {
	switch (eapMethod) {		switch (eapMethod) {
	/** Valid methods */		/** Valid methods */
			case Eap.WAPI_CERT:
			mEapMethod = eapMethod;
			setPhase2Method(Phase2.NONE);
			break;
	case Eap.TLS:		case Eap.TLS:
	case Eap.UNAUTH_TLS:		case Eap.UNAUTH_TLS:
	setPhase2Method(Phase2.NONE);		setPhase2Method(Phase2.NONE);
	@@ -1313,4 +1353,29 @@ public class WifiEnterpriseConfig implements Parcelable {
	}		}
	return false;		return false;
	}		}

			/**
			* Set the WAPI certificate suite name on wpa_supplicant.
			*
			* If this field is not specified, WAPI-CERT uses ASU ID from WAI packet
			* as the certificate suite name automatically.
			*
			* @param wapiCertSuite The name for WAPI certificate suite, or null/empty string to clear.
			* @hide
			*/
			@SystemApi
			public void setWapiCertSuite(@Nullable String wapiCertSuite) {
			setFieldValue(WAPI_CERT_SUITE_KEY, wapiCertSuite);
			}

			/**
			* Get the WAPI certificate suite name
			* @return the certificate suite name
			* @hide
			*/
			@Nullable
			@SystemApi
			public String getWapiCertSuite() {
			return getFieldValue(WAPI_CERT_SUITE_KEY);
			}
	}		}