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

Commit 964a0ef4 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

[Invisalign2] add init and reset for tSMP_CB am: 42cf9beb am: dc825b3b am: fd19cdf0 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2853676



Change-Id: I26f37162f490e7feed455d5bafb5e78673786bf1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c4dfd6a fd19cdf0

system/stack/smp/smp_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -2021,7 +2021,7 @@ void smp_set_local_oob_random_commitment(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  // connector will fail commitment check and dhkey exchange.

  smp_save_local_oob_data(p_cb);



  smp_cb_cleanup(p_cb);

  p_cb->reset();

}



/*******************************************************************************

system/stack/smp/smp_api.cc

+1 −22
Original line number Diff line number Diff line
@@ -31,11 +31,9 @@ 
#include "l2c_api.h"

#include "l2cdefs.h"

#include "os/log.h"

#include "p_256_ecc_pp.h"

#include "smp_int.h"

#include "stack/btm/btm_dev.h"

#include "stack/include/bt_octets.h"

#include "stack_config.h"

#include "types/raw_address.h"



/*******************************************************************************
@@ -47,26 +45,7 @@ 
 * Returns          void

 *

 ******************************************************************************/

void SMP_Init(uint8_t init_security_mode) {

  memset(&smp_cb, 0, sizeof(tSMP_CB));



  smp_cb.init_security_mode = init_security_mode;



  smp_cb.smp_rsp_timer_ent = alarm_new("smp.smp_rsp_timer_ent");

  smp_cb.delayed_auth_timer_ent = alarm_new("smp.delayed_auth_timer_ent");



  LOG_VERBOSE("init_security_mode:%d", init_security_mode);



  smp_l2cap_if_init();

  /* initialization of P-256 parameters */

  p_256_init_curve();



  /* Initialize failure case for certification */

  smp_cb.cert_failure = static_cast<tSMP_STATUS>(

      stack_config_get_interface()->get_pts_smp_failure_case());

  if (smp_cb.cert_failure)

    LOG_ERROR("PTS FAILURE MODE IN EFFECT (CASE %d)", smp_cb.cert_failure);

}

void SMP_Init(uint8_t init_security_mode) { smp_cb.init(init_security_mode); }



/*******************************************************************************

 *

system/stack/smp/smp_int.h

+9 −3
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#ifndef SMP_INT_H

#define SMP_INT_H



#include <cstdint>



#include "macros.h"

#include "osi/include/alarm.h"

#include "stack/include/bt_hdr.h"
@@ -274,7 +276,12 @@ typedef struct { 
} tSMP_REQ_Q_ENTRY;



/* SMP control block */

typedef struct {

class tSMP_CB {

 public:

  void init(uint8_t security_mode);

  void reset();



 public:

  uint8_t init_security_mode{0};

  tSMP_CALLBACK* p_callback;

  alarm_t* smp_rsp_timer_ent;
@@ -352,7 +359,7 @@ typedef struct { 
  tSMP_STATUS cert_failure; /*failure case for certification */

  alarm_t* delayed_auth_timer_ent;

  tBLE_BD_ADDR pairing_ble_bd_addr;

} tSMP_CB;

};



/* Server Action functions are of this type */

typedef void (*tSMP_ACT)(tSMP_CB* p_cb, tSMP_INT_DATA* p_data);
@@ -452,7 +459,6 @@ void smp_data_ind(const RawAddress& bd_addr, BT_HDR* p_buf); 
void smp_log_metrics(const RawAddress& bd_addr, bool is_outgoing,

                     const uint8_t* p_buf, size_t buf_len, bool is_over_br);

bool smp_send_cmd(uint8_t cmd_code, tSMP_CB* p_cb);

void smp_cb_cleanup(tSMP_CB* p_cb);

void smp_reset_control_value(tSMP_CB* p_cb);

void smp_proc_pairing_cmpl(tSMP_CB* p_cb);

void smp_convert_string_to_tk(Octet16* tk, uint32_t passkey);

system/stack/smp/smp_utils.cc

+41 −16
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 ******************************************************************************/

#define LOG_TAG "smp"



#include <cstdint>

#include <cstring>



#include "crypto_toolbox/crypto_toolbox.h"
@@ -30,6 +31,7 @@ 
#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "p_256_ecc_pp.h"

#include "smp_int.h"

#include "stack/btm/btm_ble_sec.h"

#include "stack/btm/btm_dev.h"
@@ -42,6 +44,7 @@ 
#include "stack/include/l2c_api.h"

#include "stack/include/smp_status.h"

#include "stack/include/stack_metrics_logging.h"

#include "stack_config.h"

#include "types/raw_address.h"



#define SMP_PAIRING_REQ_SIZE 7
@@ -876,30 +879,52 @@ void smp_xor_128(Octet16* a, const Octet16& b) { 
  }

}



void tSMP_CB::init(uint8_t security_mode) {

  *this = {};



  init_security_mode = security_mode;

  smp_cb.smp_rsp_timer_ent = alarm_new("smp.smp_rsp_timer_ent");

  smp_cb.delayed_auth_timer_ent = alarm_new("smp.delayed_auth_timer_ent");



  LOG_VERBOSE("init_security_mode:%d", init_security_mode);



  smp_l2cap_if_init();

  /* initialization of P-256 parameters */

  p_256_init_curve();



  /* Initialize failure case for certification */

  smp_cb.cert_failure = static_cast<tSMP_STATUS>(

      stack_config_get_interface()->get_pts_smp_failure_case());

  if (smp_cb.cert_failure)

    LOG_ERROR("PTS FAILURE MODE IN EFFECT (CASE %d)", smp_cb.cert_failure);

}



/*******************************************************************************

 *

 * Function         smp_cb_cleanup

 * Function         reset

 *

 * Description      Clean up SMP control block

 * Description      reset SMP control block

 *

 * Returns          void

 *

 ******************************************************************************/

void smp_cb_cleanup(tSMP_CB* p_cb) {

  tSMP_CALLBACK* p_callback = p_cb->p_callback;

  uint8_t init_security_mode = p_cb->init_security_mode;

  alarm_t* smp_rsp_timer_ent = p_cb->smp_rsp_timer_ent;

  alarm_t* delayed_auth_timer_ent = p_cb->delayed_auth_timer_ent;

void tSMP_CB::reset() {

  tSMP_CALLBACK* p_callback = this->p_callback;

  uint8_t init_security_mode = this->init_security_mode;

  alarm_t* smp_rsp_timer_ent = this->smp_rsp_timer_ent;

  alarm_t* delayed_auth_timer_ent = this->delayed_auth_timer_ent;



  LOG_VERBOSE("smp_cb_cleanup");

  LOG_VERBOSE("resetting SMP_CB");



  alarm_cancel(p_cb->smp_rsp_timer_ent);

  alarm_cancel(p_cb->delayed_auth_timer_ent);

  memset(p_cb, 0, sizeof(tSMP_CB));

  p_cb->p_callback = p_callback;

  p_cb->init_security_mode = init_security_mode;

  p_cb->smp_rsp_timer_ent = smp_rsp_timer_ent;

  p_cb->delayed_auth_timer_ent = delayed_auth_timer_ent;

  alarm_cancel(this->smp_rsp_timer_ent);

  alarm_cancel(this->delayed_auth_timer_ent);



  init(init_security_mode);



  this->p_callback = p_callback;

  this->init_security_mode = init_security_mode;

  this->smp_rsp_timer_ent = smp_rsp_timer_ent;

  this->delayed_auth_timer_ent = delayed_auth_timer_ent;

}



/*******************************************************************************
@@ -945,7 +970,7 @@ void smp_reset_control_value(tSMP_CB* p_cb) { 


  /* We can tell L2CAP to remove the fixed channel (if it has one) */

  smp_remove_fixed_channel(p_cb);

  smp_cb_cleanup(p_cb);

  p_cb->reset();

}



/*******************************************************************************