commit d337520d761b1b4cd10d55294782fbf4849928e6
author Hui Peng <phui@google.com> Fri Dec 08 01:51:34 2023 +0000
committer Hui Peng <phui@google.com> Sat Dec 09 01:51:42 2023 +0000
tree 7e0341ade821158233c8c6fb6755f586d22804b6
parent 2c92bb2653a77eded8bfdf25914f23b51a377309

[Invisalign2] move btm_ble_increment_sign_ctr to tBTM_SEC_REC

btm_ble_increment_sign_ctr -->
tBTM_SEC_REC::increment_sign_counter

Bug: 301661850
Test: m com.android.btservices
Flag: EXEMPT, no-op
Change-Id: I9e749f15ce13c81e4e36c0e1a1f94688c3835fce

system/stack/btm/btm_ble_sec.cc

diff --git a/system/stack/btm/btm_ble_sec.cc b/system/stack/btm/btm_ble_sec.cc
index 8f32406..15a7a5d 100644
--- a/system/stack/btm/btm_ble_sec.cc
+++ b/system/stack/btm/btm_ble_sec.cc
@@ -792,28 +792,21 @@
 
 /*******************************************************************************
  *
- * Function         btm_ble_get_enc_key_type
+ * Function         increment_sign_counter
  *
- * Description      This function is to increment local sign counter
+ * Description      This method is to increment the (local or peer) sign counter
  * Returns         None
  *
  ******************************************************************************/
-static void btm_ble_increment_sign_ctr(const RawAddress& bd_addr,
-                                       bool is_local) {
-  tBTM_SEC_DEV_REC* p_dev_rec;
-
-  LOG_VERBOSE("btm_ble_increment_sign_ctr is_local=%d", is_local);
-
-  p_dev_rec = btm_find_dev(bd_addr);
-  if (p_dev_rec != NULL) {
-    if (is_local)
-      p_dev_rec->sec_rec.ble_keys.local_counter++;
-    else
-      p_dev_rec->sec_rec.ble_keys.counter++;
-    LOG_VERBOSE("is_local=%d local sign counter=%d peer sign counter=%d",
-                is_local, p_dev_rec->sec_rec.ble_keys.local_counter,
-                p_dev_rec->sec_rec.ble_keys.counter);
+void tBTM_SEC_REC::increment_sign_counter(bool local) {
+  if (local) {
+    ble_keys.local_counter++;
+  } else {
+    ble_keys.counter++;
   }
+
+  LOG_VERBOSE("local=%d local sign counter=%d peer sign counter=%d", local,
+              ble_keys.local_counter, ble_keys.counter);
 }
 
 /*******************************************************************************
@@ -1752,7 +1745,7 @@
 
   crypto_toolbox::aes_cmac(p_rec->sec_rec.ble_keys.lcsrk, p_buf,
                            (uint16_t)(len + 4), BTM_CMAC_TLEN_SIZE, p_mac);
-  btm_ble_increment_sign_ctr(bd_addr, true);
+  p_rec->sec_rec.increment_sign_counter(true);
 
   LOG_VERBOSE("p_mac = %p", p_mac);
   LOG_VERBOSE(
@@ -1802,7 +1795,7 @@
     crypto_toolbox::aes_cmac(p_rec->sec_rec.ble_keys.pcsrk, p_orig, len,
                              BTM_CMAC_TLEN_SIZE, p_mac);
     if (CRYPTO_memcmp(p_mac, p_comp, BTM_CMAC_TLEN_SIZE) == 0) {
-      btm_ble_increment_sign_ctr(bd_addr, false);
+      p_rec->sec_rec.increment_sign_counter(false);
       verified = true;
     }
   }

system/stack/btm/security_device_record.h

diff --git a/system/stack/btm/security_device_record.h b/system/stack/btm/security_device_record.h
index 385b001..821d4e3 100644
--- a/system/stack/btm/security_device_record.h
+++ b/system/stack/btm/security_device_record.h
@@ -354,6 +354,8 @@
   }
 
   uint8_t get_encryption_key_size() const { return enc_key_size; }
+
+  void increment_sign_counter(bool local);
 };
 
 class tBTM_SEC_DEV_REC {