Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a324d7fb authored by maheshkkv's avatar maheshkkv
Browse files

Add 11az secure ranging HAL 

Bug: 364722301
Test: build successfully
Change-Id: Ia7fbf951c3f76b6f1c79b7677885f54566b68b1e
parent a7f0b8b6

wifi/aidl/default/aidl_struct_util.cpp

+10 −0
Original line number Diff line number Diff line
@@ -2727,6 +2727,16 @@ RttStatus convertLegacyRttStatusToAidl(legacy_hal::wifi_rtt_status status) { 
            return RttStatus::NAN_RANGING_PROTOCOL_FAILURE;

        case legacy_hal::RTT_STATUS_NAN_RANGING_CONCURRENCY_NOT_SUPPORTED:

            return RttStatus::NAN_RANGING_CONCURRENCY_NOT_SUPPORTED;

        case legacy_hal::RTT_STATUS_SECURE_RANGING_FAILURE_INVALID_AKM:

            return RttStatus::SECURE_RANGING_FAILURE_INVALID_AKM;

        case legacy_hal::RTT_STATUS_SECURE_RANGING_FAILURE_INVALID_CIPHER:

            return RttStatus::SECURE_RANGING_FAILURE_INVALID_CIPHER;

        case legacy_hal::RTT_STATUS_SECURE_RANGING_FAILURE_INVALID_CONFIG:

            return RttStatus::SECURE_RANGING_FAILURE_INVALID_CONFIG;

        case legacy_hal::RTT_STATUS_SECURE_RANGING_FAILURE_REJECTED:

            return RttStatus::SECURE_RANGING_FAILURE_REJECTED;

        case legacy_hal::RTT_STATUS_SECURE_RANGING_FAILURE_UNKNOWN:

            return RttStatus::SECURE_RANGING_FAILURE_UNKNOWN;

    };

    CHECK(false) << "Unknown legacy status: " << status;

}

wifi/aidl/default/wifi_legacy_hal.h

+5 −0
Original line number Diff line number Diff line
@@ -212,6 +212,11 @@ using ::RTT_STATUS_INVALID_REQ; 
using ::RTT_STATUS_NAN_RANGING_CONCURRENCY_NOT_SUPPORTED;

using ::RTT_STATUS_NAN_RANGING_PROTOCOL_FAILURE;

using ::RTT_STATUS_NO_WIFI;

using ::RTT_STATUS_SECURE_RANGING_FAILURE_INVALID_AKM;

using ::RTT_STATUS_SECURE_RANGING_FAILURE_INVALID_CIPHER;

using ::RTT_STATUS_SECURE_RANGING_FAILURE_INVALID_CONFIG;

using ::RTT_STATUS_SECURE_RANGING_FAILURE_REJECTED;

using ::RTT_STATUS_SECURE_RANGING_FAILURE_UNKNOWN;

using ::RTT_STATUS_SUCCESS;

using ::RTT_TYPE_1_SIDED;

using ::RTT_TYPE_2_SIDED;

wifi/legacy_headers/include/hardware_legacy/rtt.h

+113 −18
Original line number Diff line number Diff line
@@ -22,9 +22,18 @@ typedef enum { 
    RTT_STATUS_FAIL_BUSY_TRY_LATER = 12,     // responder cannot collaborate at time of request

    RTT_STATUS_INVALID_REQ = 13,             // bad request args

    RTT_STATUS_NO_WIFI = 14,                 // WiFi not enabled

    RTT_STATUS_FAIL_FTM_PARAM_OVERRIDE = 15, // Responder overrides param info, cannot range with new params

    RTT_STATUS_FAIL_FTM_PARAM_OVERRIDE =

            15,  // Responder overrides param info, cannot range with new params

    RTT_STATUS_NAN_RANGING_PROTOCOL_FAILURE = 16,           // Negotiation failure

    RTT_STATUS_NAN_RANGING_CONCURRENCY_NOT_SUPPORTED = 17,  // concurrency not supported (NDP+RTT)

    RTT_STATUS_SECURE_RANGING_FAILURE_INVALID_AKM = 18,  // Secure Ranging failed due to invalid AKM

                                                         // (Authentication and Key Management)

    RTT_STATUS_SECURE_RANGING_FAILURE_INVALID_CIPHER = 19,  // Secure Ranging failed due to invalid

                                                            // Cipher

    RTT_STATUS_SECURE_RANGING_FAILURE_INVALID_CONFIG = 20,  // Secure Ranging failed due to invalid

                                                            // configuration

    RTT_STATUS_SECURE_RANGING_FAILURE_REJECTED = 21,        // Secure ranging rejected by the AP.2

    RTT_STATUS_SECURE_RANGING_FAILURE_UNKNOWN = 22,         // Secure ranging failure unknown

} wifi_rtt_status;



/* RTT peer type */
@@ -68,6 +77,49 @@ typedef enum { 
    RTT_TYPE_2_SIDED_11AZ_NTB_SECURE = 0x4,

} wifi_rtt_type;



/* RTT AKM type */

typedef enum {

    WPA_KEY_MGMT_NONE = 0x0,

    WPA_KEY_MGMT_PASN = 0x1,

    WPA_KEY_MGMT_SAE = 0x2,

    WPA_KEY_MGMT_EAP_FT_SHA256 = 0x4,

    WPA_KEY_MGMT_FT_PSK_SHA256 = 0x8,

    WPA_KEY_MGMT_EAP_FT_SHA384 = 0x10,

    WPA_KEY_MGMT_FT_PSK_SHA384 = 0x20,

    WPA_KEY_MGMT_EAP_FILS_SHA256 = 0x40,

    WPA_KEY_MGMT_EAP_FILS_SHA384 = 0x80

} wifi_rtt_akm;



typedef enum {

    WPA_CIPHER_NONE = 0x0,

    WPA_CIPHER_CCMP_128 = 0x1,

    WPA_CIPHER_CCMP_256 = 0x2,

    WPA_CIPHER_GCMP_128 = 0x4,

    WPA_CIPHER_GCMP_256 = 0x8,

} wifi_rtt_cipher_suite;



#define RTT_SECURITY_MAX_PASSPHRASE_LEN 63

#define PMKID_LEN 16



typedef struct {

    wifi_rtt_akm base_akm;  // Base Authentication and Key Management (AKM) protocol used for PASN

    wifi_rtt_cipher_suite pairwise_cipher_suite;  // Pairwise cipher suite used for the PTKSA

                                                  // (Pairwise Transient Key Security Association)

    u32 passphrase_len;

    u8 passphrase[RTT_SECURITY_MAX_PASSPHRASE_LEN];  // Passphrase for the base AKM. This can be

                                                     // empty based on the AKM type.

    u32 pmkid_len;

    u8 pmkid[PMKID_LEN];  // PMKID corresponding to the cached PMK from the base AKM. PMKID can be

                          // null if no cached PMK is present.



} wifi_rtt_pasn_config;



typedef struct {

    wifi_rtt_pasn_config pasn_config;

    bool enable_secure_he_ltf;

    bool enable_ranging_frame_protection;

} wifi_rtt_secure_config;



/* RTT configuration */

typedef struct {

    mac_addr addr;                 // peer device mac address
@@ -127,6 +179,11 @@ typedef struct { 
                                  // units of 10 milliseconds

} wifi_rtt_config_v3;



typedef struct {

    wifi_rtt_config_v3 rtt_config;

    wifi_rtt_secure_config rtt_secure_config;

} wifi_rtt_config_v4;



/* RTT results */

typedef struct {

    mac_addr addr;                // device mac address
@@ -197,6 +254,14 @@ typedef struct { 
  byte num_rx_sts;                 // Number of receive space-time streams used.

} wifi_rtt_result_v3;



typedef struct {

    wifi_rtt_result_v3 rtt_result_v3;

    bool is_ranging_protection_enabled;

    bool is_secure_ltf_enabled;

    wifi_rtt_akm base_akm;

    wifi_rtt_cipher_suite cipher_suite;

    int secure_he_ltf_protocol_version;

} wifi_rtt_result_v4;



/* RTT result callbacks */

typedef struct {
@@ -234,6 +299,15 @@ typedef struct { 
                               wifi_rtt_result_v3 *rtt_result_v3[]);

} wifi_rtt_event_handler_v3;



/* RTT result v4 callback (secure ranging support) */

typedef struct {

    /*

     * Called when vendor implementation supports sending RTT results version 4 (Added support for

     * secure 11az ranging)

     */

    void (*on_rtt_results_v4)(wifi_request_id id, unsigned num_results,

                              wifi_rtt_result_v4* rtt_result_v4[]);

} wifi_rtt_event_handler_v4;



/* v3 API to request RTT measurement(11az support).  */

wifi_error wifi_rtt_range_request_v3(wifi_request_id id,
@@ -242,6 +316,11 @@ wifi_error wifi_rtt_range_request_v3(wifi_request_id id, 
                                     wifi_rtt_config_v3 rtt_config_v3[],

                                     wifi_rtt_event_handler_v3 handler);



/* v4 API to request RTT measurement(11az security support). */

wifi_error wifi_rtt_range_request_v4(wifi_request_id id, wifi_interface_handle iface,

                                     unsigned num_rtt_config, wifi_rtt_config_v4 rtt_config_v4[],

                                     wifi_rtt_event_handler_v4 handler);



/* API to cancel RTT measurements */

wifi_error wifi_rtt_range_cancel(wifi_request_id id,  wifi_interface_handle iface,

        unsigned num_devices, mac_addr addr[]);
@@ -313,10 +392,26 @@ typedef struct { 
    byte ntb_responder_supported;   // if 11az non-TB responder is supported

} wifi_rtt_capabilities_v3;



/* RTT Capabilities v4 (11az secure support) */

typedef struct {

    wifi_rtt_capabilities_v3 rtt_capab_v3;

    bool secure_ltf_supported;

    bool ranging_fame_protection_supported;

    wifi_rtt_akm supported_akms;  // Bitmap of wifi_rtt_akm values indicating the set of supported

                                  // AKMs.

    wifi_rtt_cipher_suite

            supported_cipher_suites;  // Bitmap of wifi_rtt_cipher_suite values

                                      // indicating the set of supported pairwise cipher suites.

} wifi_rtt_capabilities_v4;



/*  RTT capabilities v3 of the device (11az support) */

wifi_error wifi_get_rtt_capabilities_v3(wifi_interface_handle iface,

                                        wifi_rtt_capabilities_v3 *capabilities);



/*  RTT capabilities v4 of the device (11az secure support) */

wifi_error wifi_get_rtt_capabilities_v4(wifi_interface_handle iface,

                                        wifi_rtt_capabilities_v4* capabilities);



/* debugging definitions */

enum {

    RTT_DEBUG_DISABLE,