diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index edc88437bb1f..801b1c67ecc6 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -3883,7 +3883,6 @@ hdd_roam_mic_error_indication_handler(struct hdd_adapter *adapter, GFP_KERNEL); } -#ifdef CRYPTO_SET_KEY_CONVERGED static QDF_STATUS wlan_hdd_set_key_helper(struct hdd_adapter *adapter, uint32_t *roam_id) { @@ -3903,20 +3902,6 @@ static QDF_STATUS wlan_hdd_set_key_helper(struct hdd_adapter *adapter, return QDF_STATUS_SUCCESS; } -#else -static QDF_STATUS wlan_hdd_set_key_helper(struct hdd_adapter *adapter, - uint32_t *roam_id) -{ - struct hdd_station_ctx *sta_ctx = - WLAN_HDD_GET_STATION_CTX_PTR(adapter); - struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - - return sme_roam_set_key(hdd_ctx->mac_handle, - adapter->vdev_id, - &sta_ctx->ibss_enc_key, - roam_id); -} -#endif /** * roam_roam_connect_status_update_handler() - IBSS connect status update diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index f15c82920381..79ac12c78b40 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -15796,45 +15796,6 @@ void wlan_hdd_cfg80211_deregister_frames(struct hdd_adapter *adapter) WNM_NOTIFICATION_FRAME_SIZE); } -#if defined(FEATURE_WLAN_WAPI) && !defined(CRYPTO_SET_KEY_CONVERGED) -static void wlan_hdd_cfg80211_set_key_wapi(struct hdd_adapter *adapter, - uint8_t key_index, - const uint8_t *mac_addr, - const uint8_t *key, - int key_len) -{ - tCsrRoamSetKey set_key; - QDF_STATUS status; - uint32_t roam_id = INVALID_ROAM_ID; - mac_handle_t mac_handle; - - hdd_debug("Device_mode %s(%d)", - qdf_opmode_str(adapter->device_mode), adapter->device_mode); - - qdf_mem_zero(&set_key, sizeof(set_key)); - set_key.keyId = key_index; - set_key.encType = eCSR_ENCRYPT_TYPE_WPI; - set_key.keyDirection = eSIR_TX_RX; - set_key.paeRole = 0; - if (!mac_addr || is_broadcast_ether_addr(mac_addr)) - qdf_set_macaddr_broadcast(&set_key.peerMac); - else - qdf_mem_copy(set_key.peerMac.bytes, mac_addr, - QDF_MAC_ADDR_SIZE); - - set_key.keyLength = key_len; - memcpy(set_key.Key, key, key_len); - - hdd_debug("WAPI KEY LENGTH:0x%04x", key_len); - - mac_handle = hdd_adapter_get_mac_handle(adapter); - status = sme_roam_set_key(mac_handle, adapter->vdev_id, - &set_key, &roam_id); - if (status != QDF_STATUS_SUCCESS) - hdd_err("sme_roam_set_key failed status: %d", status); -} -#endif /* FEATURE_WLAN_WAPI */ - bool wlan_hdd_is_ap_supports_immediate_power_save(uint8_t *ies, int length) { const uint8_t *vendor_ie; @@ -16470,7 +16431,6 @@ static int wlan_hdd_change_station(struct wiphy *wiphy, return errno; } -#ifdef CRYPTO_SET_KEY_CONVERGED #ifdef FEATURE_WLAN_ESE static bool hdd_is_krk_enc_type(uint32_t cipher_type) { @@ -16500,9 +16460,7 @@ static bool hdd_is_btk_enc_type(uint32_t cipher_type) return false; } #endif -#endif -#ifdef CRYPTO_SET_KEY_CONVERGED #ifdef QCA_IBSS_SUPPORT /** * wlan_hdd_add_key_ibss() - API to add IBSS key @@ -16748,335 +16706,6 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, return errno; } -#else /* !CRYPTO_SET_KEY_CONVERGED */ -/* - * FUNCTION: __wlan_hdd_cfg80211_add_key - * This function is used to initialize the key information - */ -static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, - struct net_device *ndev, - u8 key_index, bool pairwise, - const u8 *mac_addr, - struct key_params *params) -{ - struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev); - tCsrRoamSetKey set_key; - int errno; - uint32_t roam_id = INVALID_ROAM_ID; - QDF_STATUS status; - struct hdd_context *hdd_ctx; - mac_handle_t mac_handle; - - hdd_enter(); - - if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { - hdd_err("Command not allowed in FTM mode"); - return -EINVAL; - } - - if (wlan_hdd_validate_vdev_id(adapter->vdev_id)) - return -EINVAL; - - qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_ADD_KEY, - adapter->vdev_id, params->key_len); - - hdd_ctx = WLAN_HDD_GET_CTX(adapter); - errno = wlan_hdd_validate_context(hdd_ctx); - - if (errno) - return errno; - - hdd_debug("Device_mode %s(%d)", - qdf_opmode_str(adapter->device_mode), adapter->device_mode); - - if (CSR_MAX_NUM_KEY <= key_index) { - hdd_err("Invalid key index %d", key_index); - - return -EINVAL; - } - - if (CSR_MAX_KEY_LEN < params->key_len) { - hdd_err("Invalid key length %d", params->key_len); - - return -EINVAL; - } - - if (WLAN_CRYPTO_RSC_SIZE < params->seq_len) { - hdd_err("Invalid seq length %d", params->seq_len); - - return -EINVAL; - } - - hdd_debug("key index %d, key length %d, seq length %d", - key_index, params->key_len, params->seq_len); - - /*extract key idx, key len and key */ - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - set_key.keyId = key_index; - set_key.keyLength = params->key_len; - qdf_mem_copy(&set_key.Key[0], params->key, params->key_len); - qdf_mem_copy(&set_key.keyRsc[0], params->seq, params->seq_len); - - mac_handle = hdd_ctx->mac_handle; - - switch (params->cipher) { - case WLAN_CIPHER_SUITE_WEP40: - set_key.encType = eCSR_ENCRYPT_TYPE_WEP40_STATICKEY; - break; - - case WLAN_CIPHER_SUITE_WEP104: - set_key.encType = eCSR_ENCRYPT_TYPE_WEP104_STATICKEY; - break; - - case WLAN_CIPHER_SUITE_TKIP: - { - u8 *key = &set_key.Key[0]; - - set_key.encType = eCSR_ENCRYPT_TYPE_TKIP; - qdf_mem_zero(key, CSR_MAX_KEY_LEN); - - /* Supplicant sends the 32bytes key in this order - * - * |--------------|----------|----------| - * | Tk1 |TX-MIC | RX Mic | - * |--------------|----------|----------| - * <---16bytes---><--8bytes--><--8bytes--> - * - * Sme expects the 32 bytes key to be in the below order - * - * |--------------|----------|----------| - * | Tk1 |RX-MIC | TX Mic | - * |--------------|----------|----------| - * <---16bytes---><--8bytes--><--8bytes--> - */ - /* Copy the Temporal Key 1 (TK1) */ - qdf_mem_copy(key, params->key, 16); - - /*Copy the rx mic first */ - qdf_mem_copy(&key[16], ¶ms->key[24], 8); - - /*Copy the tx mic */ - qdf_mem_copy(&key[24], ¶ms->key[16], 8); - - break; - } - - case WLAN_CIPHER_SUITE_CCMP: - set_key.encType = eCSR_ENCRYPT_TYPE_AES; - break; - -#ifdef FEATURE_WLAN_WAPI - case WLAN_CIPHER_SUITE_SMS4: - { - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - wlan_hdd_cfg80211_set_key_wapi(adapter, key_index, - mac_addr, params->key, - params->key_len); - return 0; - } -#endif - -#ifdef FEATURE_WLAN_ESE - case WLAN_CIPHER_SUITE_KRK: - set_key.encType = eCSR_ENCRYPT_TYPE_KRK; - break; -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - case WLAN_CIPHER_SUITE_BTK: - set_key.encType = eCSR_ENCRYPT_TYPE_BTK; - break; -#endif -#endif - -#ifdef WLAN_FEATURE_11W - case WLAN_CIPHER_SUITE_AES_CMAC: - set_key.encType = eCSR_ENCRYPT_TYPE_AES_CMAC; - break; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) - case WLAN_CIPHER_SUITE_BIP_GMAC_128: - set_key.encType = eCSR_ENCRYPT_TYPE_AES_GMAC_128; - break; - case WLAN_CIPHER_SUITE_BIP_GMAC_256: - set_key.encType = eCSR_ENCRYPT_TYPE_AES_GMAC_256; - break; -#endif -#endif - case WLAN_CIPHER_SUITE_GCMP: - set_key.encType = eCSR_ENCRYPT_TYPE_AES_GCMP; - break; - case WLAN_CIPHER_SUITE_GCMP_256: - set_key.encType = eCSR_ENCRYPT_TYPE_AES_GCMP_256; - break; - - default: - hdd_err("Unsupported cipher type: %u", params->cipher); - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - return -EOPNOTSUPP; - } - - hdd_debug("encryption type %d", set_key.encType); - - if (!pairwise) { - /* set group key */ - hdd_debug("setting Broadcast key"); - set_key.keyDirection = eSIR_RX_ONLY; - qdf_set_macaddr_broadcast(&set_key.peerMac); - } else { - /* set pairwise key */ - hdd_debug("setting pairwise key"); - set_key.keyDirection = eSIR_TX_RX; - qdf_mem_copy(set_key.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE); - } - if ((QDF_IBSS_MODE == adapter->device_mode) && !pairwise) { - /* if a key is already installed, block all subsequent ones */ - if (adapter->session.station.ibss_enc_key_installed) { - hdd_debug("IBSS key installed already"); - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - return 0; - } - - set_key.keyDirection = eSIR_TX_RX; - /*Set the group key */ - status = sme_roam_set_key(mac_handle, - adapter->vdev_id, &set_key, &roam_id); - - if (0 != status) { - hdd_err("sme_roam_set_key failed, status: %d", status); - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - return -EINVAL; - } - /* Save the keys here and call sme_roam_set_key for setting - * the PTK after peer joins the IBSS network - */ - qdf_mem_copy(&adapter->session.station.ibss_enc_key, - &set_key, sizeof(tCsrRoamSetKey)); - - adapter->session.station.ibss_enc_key_installed = 1; - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - return qdf_status_to_os_return(status); - } - if ((adapter->device_mode == QDF_SAP_MODE) || - (adapter->device_mode == QDF_P2P_GO_MODE)) { - struct hdd_hostapd_state *hostapd_state = - WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter); - struct hdd_ap_ctx *ap_ctx = - WLAN_HDD_GET_AP_CTX_PTR(adapter); - - if (hostapd_state->bss_state == BSS_START) { - status = wlansap_set_key_sta( - WLAN_HDD_GET_SAP_CTX_PTR(adapter), &set_key); - if (status != QDF_STATUS_SUCCESS) { - hdd_err("wlansap_set_key_sta failed status: %d", - status); - } - } - - /* Save the key in ap ctx for use on START_BSS and restart */ - if (pairwise || - eCSR_ENCRYPT_TYPE_WEP40_STATICKEY == set_key.encType || - eCSR_ENCRYPT_TYPE_WEP104_STATICKEY == set_key.encType) - qdf_mem_copy(&ap_ctx->wep_key[key_index], &set_key, - sizeof(tCsrRoamSetKey)); - else - qdf_mem_copy(&ap_ctx->group_key, &set_key, - sizeof(tCsrRoamSetKey)); - - } else if ((adapter->device_mode == QDF_STA_MODE) || - (adapter->device_mode == QDF_P2P_CLIENT_MODE)) { - struct hdd_station_ctx *sta_ctx = - WLAN_HDD_GET_STATION_CTX_PTR(adapter); - struct csr_roam_profile *roam_profile; - - if (!pairwise) { - /* set group key */ - if (sta_ctx->roam_info.defer_key_complete) { - hdd_debug("Perform Set key Complete"); - hdd_perform_roam_set_key_complete(adapter); - } - } - - roam_profile = hdd_roam_profile(adapter); - roam_profile->Keys.KeyLength[key_index] = params->key_len; - - roam_profile->Keys.defaultIndex = key_index; - - qdf_mem_copy(&roam_profile->Keys.KeyMaterial[key_index][0], - params->key, params->key_len); - - hdd_debug("Set key for peerMac "QDF_MAC_ADDR_STR" direction %d", - QDF_MAC_ADDR_ARRAY(set_key.peerMac.bytes), - set_key.keyDirection); - - /* The supplicant may attempt to set the PTK once - * pre-authentication is done. Save the key in the - * UMAC and include it in the ADD BSS request - */ - status = sme_ft_update_key(mac_handle, - adapter->vdev_id, &set_key); - if (status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) { - hdd_debug("Update PreAuth Key success"); - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - return 0; - } else if (status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) { - hdd_err("Update PreAuth Key failed"); - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - return -EINVAL; - } - - /* issue set key request to SME */ - status = sme_roam_set_key(mac_handle, - adapter->vdev_id, &set_key, - &roam_id); - - if (0 != status) { - hdd_err("sme_roam_set_key failed, status: %d", status); - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - return -EINVAL; - } - - if (adapter->send_mode_change) { - wlan_hdd_send_mode_change_event(); - adapter->send_mode_change = false; - } - - /* in case of IBSS as there was no information - * available about WEP keys during IBSS join, group - * key initialized with NULL key, so re-initialize - * group key with correct value - */ - if ((eCSR_BSS_TYPE_START_IBSS == roam_profile->BSSType) && - !((HDD_AUTH_KEY_MGMT_802_1X == - (sta_ctx->auth_key_mgmt & HDD_AUTH_KEY_MGMT_802_1X)) - && (eCSR_AUTH_TYPE_OPEN_SYSTEM == - sta_ctx->conn_info.auth_type) - ) - && ((WLAN_CIPHER_SUITE_WEP40 == params->cipher) - || (WLAN_CIPHER_SUITE_WEP104 == params->cipher) - ) - ) { - set_key.keyDirection = eSIR_RX_ONLY; - qdf_set_macaddr_broadcast(&set_key.peerMac); - - hdd_debug("Set key peerMac "QDF_MAC_ADDR_STR" direction %d", - QDF_MAC_ADDR_ARRAY(set_key.peerMac.bytes), - set_key.keyDirection); - - status = sme_roam_set_key(mac_handle, - adapter->vdev_id, &set_key, - &roam_id); - - if (0 != status) { - hdd_err("sme_roam_set_key failed for group key (IBSS), returned %d", status); - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - return -EINVAL; - } - } - } - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - hdd_exit(); - return 0; -} -#endif /* CRYPTO_SET_KEY_CONVERGED */ static int wlan_hdd_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, @@ -17284,24 +16913,6 @@ static int wlan_hdd_cfg80211_del_key(struct wiphy *wiphy, return errno; } -#ifndef CRYPTO_SET_KEY_CONVERGED -#ifdef FEATURE_WLAN_WAPI -static bool hdd_is_wapi_enc_type(eCsrEncryptionType encrypt_type) -{ - if (encrypt_type == eCSR_ENCRYPT_TYPE_WPI) - return true; - - return false; -} -#else -static bool hdd_is_wapi_enc_type(eCsrEncryptionType encrypt_type) -{ - return false; -} -#endif -#endif - -#ifdef CRYPTO_SET_KEY_CONVERGED static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev, u8 key_index, @@ -17370,160 +16981,6 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, return ret; } -#else -/* - * FUNCTION: __wlan_hdd_cfg80211_set_default_key - * This function is used to set the default tx key index - */ -static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, - struct net_device *ndev, - u8 key_index, - bool unicast, bool multicast) -{ - struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev); - struct hdd_context *hdd_ctx; - mac_handle_t mac_handle; - int status; - - hdd_enter(); - - if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) { - hdd_err("Command not allowed in FTM mode"); - return -EINVAL; - } - - if (wlan_hdd_validate_vdev_id(adapter->vdev_id)) - return -EINVAL; - - qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD, - TRACE_CODE_HDD_CFG80211_SET_DEFAULT_KEY, - adapter->vdev_id, key_index); - - hdd_debug("Device_mode %s(%d) key_index = %d", - qdf_opmode_str(adapter->device_mode), - adapter->device_mode, key_index); - - if (CSR_MAX_NUM_KEY <= key_index) { - hdd_err("Invalid key index: %d", key_index); - return -EINVAL; - } - - hdd_ctx = WLAN_HDD_GET_CTX(adapter); - status = wlan_hdd_validate_context(hdd_ctx); - - if (0 != status) - return status; - - mac_handle = hdd_ctx->mac_handle; - - if ((adapter->device_mode == QDF_STA_MODE) || - (adapter->device_mode == QDF_P2P_CLIENT_MODE)) { - struct hdd_station_ctx *sta_ctx = - WLAN_HDD_GET_STATION_CTX_PTR(adapter); - struct csr_roam_profile *roam_profile; - - roam_profile = hdd_roam_profile(adapter); - - if ((eCSR_ENCRYPT_TYPE_TKIP != - sta_ctx->conn_info.uc_encrypt_type) && - !hdd_is_wapi_enc_type( - sta_ctx->conn_info.uc_encrypt_type) && - (eCSR_ENCRYPT_TYPE_AES != - sta_ctx->conn_info.uc_encrypt_type) && - (eCSR_ENCRYPT_TYPE_AES_GCMP != - sta_ctx->conn_info.uc_encrypt_type) && - (eCSR_ENCRYPT_TYPE_AES_GCMP_256 != - sta_ctx->conn_info.uc_encrypt_type)) { - /* If default key index is not same as previous one, - * then update the default key index - */ - - tCsrRoamSetKey set_key; - uint32_t roam_id = INVALID_ROAM_ID; - tCsrKeys *keys = &roam_profile->Keys; - - hdd_debug("Default tx key index %d", key_index); - keys->defaultIndex = (u8) key_index; - qdf_mem_zero(&set_key, sizeof(tCsrRoamSetKey)); - set_key.keyId = key_index; - set_key.keyLength = keys->KeyLength[key_index]; - - qdf_mem_copy(&set_key.Key[0], - &keys->KeyMaterial[key_index][0], - keys->KeyLength[key_index]); - - set_key.keyDirection = eSIR_TX_RX; - - qdf_copy_macaddr(&set_key.peerMac, - &sta_ctx->conn_info.bssid); - - if (keys->KeyLength[key_index] == - WLAN_CRYPTO_KEY_WEP40_LEN && - roam_profile->EncryptionType. - encryptionType[0] == eCSR_ENCRYPT_TYPE_WEP104) { - /* In the case of dynamic wep - * supplicant hardcodes DWEP type to - * eCSR_ENCRYPT_TYPE_WEP104 even - * though ap is configured for WEP-40 - * encryption. In this canse the key - * length is 5 but the encryption type - * is 104 hence checking the key - * length(5) and encryption type(104) - * and switching encryption type to 40 - */ - roam_profile->EncryptionType. - encryptionType[0] = eCSR_ENCRYPT_TYPE_WEP40; - roam_profile->mcEncryptionType. - encryptionType[0] = eCSR_ENCRYPT_TYPE_WEP40; - } - - set_key.encType = - roam_profile->EncryptionType. - encryptionType[0]; - - /* Issue set key request */ - status = sme_roam_set_key(mac_handle, - adapter->vdev_id, &set_key, - &roam_id); - - if (0 != status) { - hdd_err("sme_roam_set_key failed, status: %d", - status); - return -EINVAL; - } - } - } else if (QDF_SAP_MODE == adapter->device_mode) { - struct hdd_ap_ctx *ap_ctx = - WLAN_HDD_GET_AP_CTX_PTR(adapter); - struct csr_roam_profile *profile = - wlan_sap_get_roam_profile(ap_ctx->sap_context); - - if (!profile) { - hdd_err("Failed to get SAP Roam Profile"); - return -EINVAL; - } - /* In SoftAp mode setting key direction for default mode */ - if ((eCSR_ENCRYPT_TYPE_TKIP != - profile->EncryptionType.encryptionType[0]) && - (eCSR_ENCRYPT_TYPE_AES != - profile->EncryptionType.encryptionType[0]) && - (eCSR_ENCRYPT_TYPE_AES_GCMP != - profile->EncryptionType.encryptionType[0]) && - (eCSR_ENCRYPT_TYPE_AES_GCMP_256 != - profile->EncryptionType.encryptionType[0])) { - /* Saving key direction for default key index to TX default */ - ap_ctx->wep_key[key_index].keyDirection = - eSIR_TX_DEFAULT; - hdd_debug("WEP default key index set to SAP context %d", - key_index); - ap_ctx->wep_def_key_idx = key_index; - } - } - - hdd_exit(); - return status; -} -#endif static int wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *ndev, @@ -20174,7 +19631,6 @@ wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy, } #endif -#ifdef CRYPTO_SET_KEY_CONVERGED static void wlan_hdd_cfg80211_store_wep_key(struct hdd_adapter *adapter, struct wlan_objmgr_vdev *vdev, struct cfg80211_connect_params *req) @@ -20189,22 +19645,6 @@ static void wlan_hdd_cfg80211_store_wep_key(struct hdd_adapter *adapter, WLAN_CRYPTO_KEY_TYPE_UNICAST, NULL, ¶ms); } -#else -static void wlan_hdd_cfg80211_store_wep_key(struct hdd_adapter *adapter, - struct wlan_objmgr_vdev *vdev, - struct cfg80211_connect_params *req) -{ - struct csr_roam_profile *roam_profile; - - roam_profile = hdd_roam_profile(adapter); - hdd_debug("setting default wep key, key_idx = %hu key_len %hu", - req->key_idx, req->key_len); - qdf_mem_copy(&roam_profile->Keys.KeyMaterial[req->key_idx][0], - req->key, req->key_len); - roam_profile->Keys.KeyLength[req->key_idx] = req->key_len; - roam_profile->Keys.defaultIndex = req->key_idx; -} -#endif /* !CRYPTO_SET_KEY_CONVERGED */ /** * wlan_hdd_cfg80211_set_privacy() - set security parameters during connection diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index b0f814126c2b..f182d8c30c11 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1657,7 +1657,6 @@ hdd_hostapd_apply_action_oui(struct hdd_context *hdd_ctx, hdd_err("Failed to disable aggregation for peer"); } -#ifdef CRYPTO_SET_KEY_CONVERGED static void hdd_hostapd_set_sap_key(struct hdd_adapter *adapter) { struct wlan_crypto_key *crypto_key; @@ -1676,34 +1675,6 @@ static void hdd_hostapd_set_sap_key(struct hdd_adapter *adapter) wma_update_set_key(adapter->vdev_id, true, 0, crypto_key->cipher_type); } -#else -static void hdd_hostapd_set_sap_key(struct hdd_adapter *adapter) -{ - struct hdd_ap_ctx *ap_ctx; - QDF_STATUS status; - uint8_t i; - - ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); - /* Set group key / WEP key every time when BSS is restarted */ - if (ap_ctx->group_key.keyLength) { - status = wlansap_set_key_sta(WLAN_HDD_GET_SAP_CTX_PTR(adapter), - &ap_ctx->group_key); - if (!QDF_IS_STATUS_SUCCESS(status)) - hdd_err("wlansap_set_key_sta failed"); - } else { - for (i = 0; i < CSR_MAX_NUM_KEY; i++) { - if (!ap_ctx->wep_key[i].keyLength) - continue; - - status = wlansap_set_key_sta(WLAN_HDD_GET_SAP_CTX_PTR - (adapter), - &ap_ctx->wep_key[i]); - if (!QDF_IS_STATUS_SUCCESS(status)) - hdd_err("set_key failed idx: %d", i); - } - } -} -#endif QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event, void *context) diff --git a/core/sap/inc/sap_api.h b/core/sap/inc/sap_api.h index aa6f90234939..14d7fcb5fcbb 100644 --- a/core/sap/inc/sap_api.h +++ b/core/sap/inc/sap_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -932,18 +932,6 @@ QDF_STATUS wlansap_set_channel_change_with_csa(struct sap_context *sap_ctx, enum phy_ch_width target_bw, bool strict); -/** - * wlansap_set_key_sta() - set keys for a stations. - * @sap_ctx: Pointer to the SAP context - * @key_info : tCsrRoamSetKey structure for the station - * - * This api function provides for Ap App/HDD to set key for a station. - * - * Return: The QDF_STATUS code associated with performing the operation - * QDF_STATUS_SUCCESS: Success - */ -QDF_STATUS wlansap_set_key_sta(struct sap_context *sap_ctx, - tCsrRoamSetKey *key_info); /** * wlan_sap_getstation_ie_information() - RSNIE Population diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index 7d8f4f594346..e0661bed3ad3 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -1594,59 +1594,6 @@ QDF_STATUS wlansap_set_channel_change_with_csa(struct sap_context *sap_ctx, return QDF_STATUS_SUCCESS; } -#ifdef CRYPTO_SET_KEY_CONVERGED -static QDF_STATUS wlan_sap_set_key_helper(struct sap_context *sap_ctx, - tCsrRoamSetKey *set_key_info) -{ - struct wlan_crypto_key *crypto_key; - - crypto_key = wlan_crypto_get_key(sap_ctx->vdev, 0); - if (!crypto_key) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "Crypto KEY is NULL"); - return QDF_STATUS_E_FAILURE; - } - - return ucfg_crypto_set_key_req(sap_ctx->vdev, crypto_key, - WLAN_CRYPTO_KEY_TYPE_UNICAST); -} -#else -static QDF_STATUS wlan_sap_set_key_helper(struct sap_context *sap_ctx, - tCsrRoamSetKey *set_key_info) -{ - uint32_t roam_id = INVALID_ROAM_ID; - struct mac_context *mac; - - mac = sap_get_mac_context(); - if (!mac) { - QDF_TRACE_ERROR(QDF_MODULE_ID_SAP, "Invalid MAC context"); - return QDF_STATUS_E_FAULT; - } - - return sme_roam_set_key(MAC_HANDLE(mac), sap_ctx->sessionId, - set_key_info, &roam_id); -} -#endif - -QDF_STATUS wlansap_set_key_sta(struct sap_context *sap_ctx, - tCsrRoamSetKey *set_key_info) -{ - QDF_STATUS qdf_status; - - if (!sap_ctx) { - QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR, - "%s: Invalid SAP pointer", - __func__); - return QDF_STATUS_E_FAULT; - } - - qdf_status = wlan_sap_set_key_helper(sap_ctx, set_key_info); - if (qdf_status != QDF_STATUS_SUCCESS) - qdf_status = QDF_STATUS_E_FAULT; - - return qdf_status; -} - QDF_STATUS wlan_sap_getstation_ie_information(struct sap_context *sap_ctx, uint32_t *len, uint8_t *buf) {