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

Commit 692219b7 authored by Jack He's avatar Jack He
Browse files

Change the parameter type of smp_debug_print_nbyte_little_endian 

* This function used to take (const uint8_t*) as the second parameter
  and it causes all its calls to cast a (const char*) to this type
* This patch changes it to (const char*) so no cast needed

Coccinelle-assisted:

@ rule1 @
type T;
expression A, B, C;
@@

smp_debug_print_nbyte_little_endian(A,
- (T)
B, C);

and

for file in $(find . -name "*.cc"); do
  spatch --sp-file refactor_smp_print_func.cocci --in-place $file
done

Bug: 33663033
Test: code compilation, no user visible effect
Change-Id: Ibeed0b414514acc4a8e94e47e99117bdb3e454ff
parent e98040c4

system/stack/smp/smp_act.cc

+9 −11
Original line number Diff line number Diff line
@@ -1799,23 +1799,21 @@ void smp_set_local_oob_random_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  uint8_t* p_print = NULL;

  SMP_TRACE_DEBUG("local SC OOB data set:");

  p_print = (uint8_t*)&p_cb->sc_oob_data.loc_oob_data.addr_sent_to;

  smp_debug_print_nbyte_little_endian(p_print, (const uint8_t*)"addr_sent_to",

  smp_debug_print_nbyte_little_endian(p_print, "addr_sent_to",

                                      sizeof(tBLE_BD_ADDR));

  p_print = (uint8_t*)&p_cb->sc_oob_data.loc_oob_data.private_key_used;

  smp_debug_print_nbyte_little_endian(

      p_print, (const uint8_t*)"private_key_used", BT_OCTET32_LEN);

  smp_debug_print_nbyte_little_endian(p_print, "private_key_used",

                                      BT_OCTET32_LEN);

  p_print = (uint8_t*)&p_cb->sc_oob_data.loc_oob_data.publ_key_used.x;

  smp_debug_print_nbyte_little_endian(

      p_print, (const uint8_t*)"publ_key_used.x", BT_OCTET32_LEN);

  smp_debug_print_nbyte_little_endian(p_print, "publ_key_used.x",

                                      BT_OCTET32_LEN);

  p_print = (uint8_t*)&p_cb->sc_oob_data.loc_oob_data.publ_key_used.y;

  smp_debug_print_nbyte_little_endian(

      p_print, (const uint8_t*)"publ_key_used.y", BT_OCTET32_LEN);

  smp_debug_print_nbyte_little_endian(p_print, "publ_key_used.y",

                                      BT_OCTET32_LEN);

  p_print = (uint8_t*)&p_cb->sc_oob_data.loc_oob_data.randomizer;

  smp_debug_print_nbyte_little_endian(p_print, (const uint8_t*)"randomizer",

                                      BT_OCTET16_LEN);

  smp_debug_print_nbyte_little_endian(p_print, "randomizer", BT_OCTET16_LEN);

  p_print = (uint8_t*)&p_cb->sc_oob_data.loc_oob_data.commitment;

  smp_debug_print_nbyte_little_endian(p_print, (const uint8_t*)"commitment",

                                      BT_OCTET16_LEN);

  smp_debug_print_nbyte_little_endian(p_print, "commitment", BT_OCTET16_LEN);

  SMP_TRACE_DEBUG("");

#endif

system/stack/smp/smp_int.h

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ extern bool smp_calculate_f6(uint8_t* w, uint8_t* n1, uint8_t* n2, uint8_t* r, 
extern bool smp_calculate_h6(uint8_t* w, uint8_t* keyid, uint8_t* h2);

#if (SMP_DEBUG == TRUE)

extern void smp_debug_print_nbyte_little_endian(uint8_t* p,

                                                const uint8_t* key_name,

                                                const char* key_name,

                                                uint8_t len);

#endif

system/stack/smp/smp_keys.cc

+86 −132

File changed.

Preview size limit exceeded, changes collapsed.