diff options
| author | Sreelakshmi Konamki <skonam@codeaurora.org> | 2017-01-04 15:01:38 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-06 20:57:45 -0800 |
| commit | bcd5262dab109b301abfe7026da25d79e9e19475 (patch) | |
| tree | 2189bc7c7c1112473348b694929a179d529bf867 | |
| parent | ae512bb7c513e6a20ba7b70a2cb2917d83140bbd (diff) | |
qcacld-3.0: Remove PTK/GTK debug logs
qcacld-2.0 to qcacld-3.0 propagation
Currently host prints PTK and GTK key information in default logs.
Fix to remove the debug logs which prints sensitive key information.
Change-Id: I358b09b77d23eeb5da7d826859ae119a8ea4af8a
CRs-Fixed: 1097857
| -rw-r--r-- | core/mac/src/pe/lim/lim_ft.c | 42 | ||||
| -rw-r--r-- | core/sme/src/common/sme_ft_api.c | 30 | ||||
| -rw-r--r-- | core/sme/src/csr/csr_api_roam.c | 8 |
3 files changed, 4 insertions, 76 deletions
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 80bfec84cfef..89626c7d1026 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -801,46 +801,6 @@ bool lim_process_ft_update_key(tpAniSirGlobal pMac, uint32_t *pMsgBuf) &pKeyInfo->bssid); pAddBssParams->extSetStaKeyParam.sendRsp = false; - - if (pAddBssParams->extSetStaKeyParam.key[0].keyLength == 16) { - PELOG1(lim_log(pMac, LOG1, - FL - ("BSS key = %02X-%02X-%02X-%02X-%02X-%02X-%02X- " - "%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X"), - pAddBssParams->extSetStaKeyParam.key[0]. - key[0], - pAddBssParams->extSetStaKeyParam.key[0]. - key[1], - pAddBssParams->extSetStaKeyParam.key[0]. - key[2], - pAddBssParams->extSetStaKeyParam.key[0]. - key[3], - pAddBssParams->extSetStaKeyParam.key[0]. - key[4], - pAddBssParams->extSetStaKeyParam.key[0]. - key[5], - pAddBssParams->extSetStaKeyParam.key[0]. - key[6], - pAddBssParams->extSetStaKeyParam.key[0]. - key[7], - pAddBssParams->extSetStaKeyParam.key[0]. - key[8], - pAddBssParams->extSetStaKeyParam.key[0]. - key[9], - pAddBssParams->extSetStaKeyParam.key[0]. - key[10], - pAddBssParams->extSetStaKeyParam.key[0]. - key[11], - pAddBssParams->extSetStaKeyParam.key[0]. - key[12], - pAddBssParams->extSetStaKeyParam.key[0]. - key[13], - pAddBssParams->extSetStaKeyParam.key[0]. - key[14], - pAddBssParams->extSetStaKeyParam.key[0]. - key[15]); - ) - } } return true; } diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c index e8c5aa87fc94..6e86a43cf97f 100644 --- a/core/sme/src/common/sme_ft_api.c +++ b/core/sme/src/common/sme_ft_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -267,11 +267,8 @@ QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, tSirKeyMaterial *keymaterial = NULL; tAniEdType ed_type; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); - int i = 0; sms_log(mac_ctx, LOG1, FL("keyLength %d"), ftkey_info->keyLength); - for (i = 0; i < ftkey_info->keyLength; i++) - sms_log(mac_ctx, LOG1, FL("%02x"), ftkey_info->Key[i]); if (ftkey_info->keyLength > CSR_MAX_KEY_LEN) { sms_log(mac_ctx, LOGE, FL("invalid keyLength %d"), @@ -301,32 +298,9 @@ QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id, keymaterial->key[0].paeRole = ftkey_info->paeRole; keymaterial->key[0].keyLength = ftkey_info->keyLength; - if (ftkey_info->keyLength) { + if (ftkey_info->keyLength) qdf_mem_copy(&keymaterial->key[0].key, ftkey_info->Key, ftkey_info->keyLength); - if (ftkey_info->keyLength == 16) { - sms_log(mac_ctx, LOG1, - FL("set update ind keyidx(%d) encType(%d) key = %02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X-%02X"), - msg->keyMaterial.key[0].keyId, - (tAniEdType) msg->keyMaterial.edType, - msg->keyMaterial.key[0].key[0], - msg->keyMaterial.key[0].key[1], - msg->keyMaterial.key[0].key[2], - msg->keyMaterial.key[0].key[3], - msg->keyMaterial.key[0].key[4], - msg->keyMaterial.key[0].key[5], - msg->keyMaterial.key[0].key[6], - msg->keyMaterial.key[0].key[7], - msg->keyMaterial.key[0].key[8], - msg->keyMaterial.key[0].key[9], - msg->keyMaterial.key[0].key[10], - msg->keyMaterial.key[0].key[11], - msg->keyMaterial.key[0].key[12], - msg->keyMaterial.key[0].key[13], - msg->keyMaterial.key[0].key[14], - msg->keyMaterial.key[0].key[15]); - } - } qdf_copy_macaddr(&msg->bssid, &ftkey_info->peerMac); msg->smeSessionId = session_id; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index ba86a34429cd..8d44d8d96c4d 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -14992,15 +14992,9 @@ QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac, /* 0 is Supplicant */ pMsg->keyMaterial.key[0].paeRole = paeRole; pMsg->keyMaterial.key[0].keyLength = keyLength; - if (keyLength && pKey) { + if (keyLength && pKey) qdf_mem_copy(pMsg->keyMaterial.key[0].key, pKey, keyLength); - sms_log(pMac, LOG1, - FL("SME set keyIndx (%d) encType (%d) key"), - keyId, edType); - sir_dump_buf(pMac, SIR_SMS_MODULE_ID, LOG1, pKey, - keyLength); - } status = cds_send_mb_message_to_mac(pMsg); } while (0); return status; |
