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

Commit 969bdb90 authored by Chris Manton's avatar Chris Manton
Browse files

Remove unused def SMP_DEBUG 

Toward readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working

Change-Id: Ic1411faf31fd6c4dc66282bfe42a0ec47c969bb1
parent 7b932dfb

system/stack/smp/smp_act.cc

+0 −22
Original line number Diff line number Diff line
@@ -1891,28 +1891,6 @@ void smp_set_local_oob_random_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
                         p_cb->sc_oob_data.loc_oob_data.publ_key_used.x,

                         p_cb->sc_oob_data.loc_oob_data.randomizer, 0);



#if (SMP_DEBUG == TRUE)

  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, "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, "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, "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, "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, "randomizer", OCTET16_LEN);

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

  smp_debug_print_nbyte_little_endian(p_print, "commitment", OCTET16_LEN);

  SMP_TRACE_DEBUG("");

#endif



  /* pass created OOB data up */

  p_cb->cb_evt = SMP_SC_LOC_OOB_DATA_UP_EVT;

  smp_send_app_cback(p_cb, NULL);

system/stack/smp/smp_int.h

+0 −13
Original line number Diff line number Diff line
@@ -488,19 +488,6 @@ extern void smp_start_nonce_generation(tSMP_CB* p_cb); 
extern bool smp_calculate_link_key_from_long_term_key(tSMP_CB* p_cb);

extern bool smp_calculate_long_term_key_from_link_key(tSMP_CB* p_cb);



#if (SMP_DEBUG == TRUE)

extern void smp_debug_print_nbyte_little_endian(uint8_t* p,

                                                const char* key_name,

                                                uint8_t len);



inline void smp_debug_print_nbyte_little_endian(const Octet16& p,

                                                const char* key_name,

                                                uint8_t len) {

  smp_debug_print_nbyte_little_endian(const_cast<uint8_t*>(p.data()), key_name,

                                      len);

}

#endif



extern void print128(const Octet16& x, const uint8_t* key_name);

extern void smp_xor_128(Octet16* a, const Octet16& b);

system/stack/smp/smp_keys.cc

+0 −48
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
 ******************************************************************************/

#include "bt_target.h"



#if (SMP_DEBUG == TRUE)

#include <stdio.h>

#endif

#include <base/bind.h>

#include <string.h>

#include "bt_utils.h"
@@ -59,25 +56,6 @@ static void smp_process_private_key(tSMP_CB* p_cb); 


void smp_debug_print_nbyte_little_endian(uint8_t* p, const char* key_name,

                                         uint8_t len) {

#if (SMP_DEBUG == TRUE)

  int ind;

  int col_count = 32;

  int row_count;

  uint8_t p_buf[512];



  SMP_TRACE_DEBUG("%s(LSB ~ MSB):", key_name);

  memset(p_buf, 0, sizeof(p_buf));

  row_count = len % col_count ? len / col_count + 1 : len / col_count;



  ind = 0;

  for (int row = 0; row < row_count; row++) {

    for (int column = 0, x = 0; (ind < len) && (column < col_count);

         column++, ind++) {

      x += snprintf((char*)&p_buf[x], sizeof(p_buf) - x, "%02x ", p[ind]);

    }

    SMP_TRACE_DEBUG("  [%03d]: %s", row * col_count, p_buf);

  }

#endif

}



inline void smp_debug_print_nbyte_little_endian(const Octet16& p,
@@ -89,25 +67,6 @@ inline void smp_debug_print_nbyte_little_endian(const Octet16& p, 


void smp_debug_print_nbyte_big_endian(uint8_t* p, const char* key_name,

                                      uint8_t len) {

#if (SMP_DEBUG == TRUE)

  uint8_t p_buf[512];



  SMP_TRACE_DEBUG("%s(MSB ~ LSB):", key_name);

  memset(p_buf, 0, sizeof(p_buf));



  int ind = 0;

  int ncols = 32; /* num entries in one line */

  int nrows;      /* num lines */



  nrows = len % ncols ? len / ncols + 1 : len / ncols;

  for (int row = 0; row < nrows; row++) {

    for (int col = 0, x = 0; (ind < len) && (col < ncols); col++, ind++) {

      x += snprintf((char*)&p_buf[len - x - 1], sizeof(p_buf) - (len - x - 1),

                    "%02x ", p[ind]);

    }

    SMP_TRACE_DEBUG("[%03d]: %s", row * ncols, p_buf);

  }

#endif

}



/** This function is called to process a passkey. */
@@ -474,9 +433,6 @@ static void smp_process_stk(tSMP_CB* p_cb, Octet16* p) { 
  tSMP_KEY key;



  SMP_TRACE_DEBUG("smp_process_stk ");

#if (SMP_DEBUG == TRUE)

  SMP_TRACE_ERROR("STK Generated");

#endif

  smp_mask_enc_key(p_cb->loc_enc_size, p);



  key.key_type = SMP_KEY_TYPE_STK;
@@ -915,10 +871,6 @@ void smp_calculate_peer_dhkey_check(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
                                         p_cb->local_random, iocap, b, a);



  SMP_TRACE_EVENT("peer DHKey check calculation is completed");

#if (SMP_DEBUG == TRUE)

  smp_debug_print_nbyte_little_endian(param_buf, "peer DHKey check",

                                      OCTET16_LEN);

#endif

  key.key_type = SMP_KEY_TYPE_PEER_DHK_CHCK;

  key.p_data = param_buf.data();

  tSMP_INT_DATA smp_int_data;