Add secure HE-LTF protocol version to capabilities
The secure HE-LTF negotiation supports negotiation of the secure HE-LTF
protocol version. IEEE 802.11az secure ranging initiator can either
proceed with responders protocol version assignment. If it does not
meet the required security level, initiator can terminate the ranging.
Secure ranging result gives the protocol version used. Add a new
parameter to get the maximum supported secure HE-LTF protocol version by
the initiator.
Bug: 378407833
Test: build successfully
Change-Id: I15bc18a09fd4fed6796bd786fcf626347345a0b1
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttCapabilities.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttCapabilities.aidl
index 6197585..90caa26 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttCapabilities.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttCapabilities.aidl
@@ -51,4 +51,5 @@
long cipherSuitesSupported;
boolean secureHeLtfSupported;
boolean rangingFrameProtectionSupported;
+ int maxSupportedSecureHeLtfProtocolVersion;
}
diff --git a/wifi/aidl/android/hardware/wifi/RttCapabilities.aidl b/wifi/aidl/android/hardware/wifi/RttCapabilities.aidl
index 0cf048d..48e211d 100644
--- a/wifi/aidl/android/hardware/wifi/RttCapabilities.aidl
+++ b/wifi/aidl/android/hardware/wifi/RttCapabilities.aidl
@@ -100,4 +100,8 @@
* Whether frame protection for ranging is supported.
*/
boolean rangingFrameProtectionSupported;
+ /**
+ * Maximum supported secure HE-LTF protocol version.
+ */
+ int maxSupportedSecureHeLtfProtocolVersion;
}
diff --git a/wifi/legacy_headers/include/hardware_legacy/rtt.h b/wifi/legacy_headers/include/hardware_legacy/rtt.h
index 631821d..93ea145 100644
--- a/wifi/legacy_headers/include/hardware_legacy/rtt.h
+++ b/wifi/legacy_headers/include/hardware_legacy/rtt.h
@@ -257,7 +257,7 @@
typedef struct {
wifi_rtt_result_v3 rtt_result_v3;
bool is_ranging_protection_enabled;
- bool is_secure_ltf_enabled;
+ bool is_secure_he_ltf_enabled;
wifi_rtt_akm base_akm;
wifi_rtt_cipher_suite cipher_suite;
int secure_he_ltf_protocol_version;
@@ -395,7 +395,9 @@
/* RTT Capabilities v4 (11az secure support) */
typedef struct {
wifi_rtt_capabilities_v3 rtt_capab_v3;
- bool secure_ltf_supported;
+ bool secure_he_ltf_supported;
+ int max_supported_secure_he_ltf_protocol_ver; // Maximum supported secure HE-LTF protocol
+ // version.
bool ranging_fame_protection_supported;
wifi_rtt_akm supported_akms; // Bitmap of wifi_rtt_akm values indicating the set of supported
// AKMs.