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

Commit d06bbf83 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Add PTS_SmpFailureCase 6 for invalid encryption key size GAP test case"... 

Merge "Add PTS_SmpFailureCase 6 for invalid encryption key size GAP test case" am: 47da5989 am: 5b72b0eb am: fda4fd75 am: d84497a2 am: dc57d0a8

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



Change-Id: I62c86163c0506fe9944c45601a9a11b2291e39db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b11269cf dc57d0a8

system/conf/bt_stack.conf

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ TRC_HID_DEV=2 
#  SMP_PAIR_AUTH_FAIL = 3

#  SMP_CONFIRM_VALUE_ERR = 4

#  SMP_PAIR_NOT_SUPPORT = 5

#  SMP_ENC_KEY_SIZE = 6

#  SMP_PAIR_FAIL_UNKNOWN = 8

#  SMP_REPEATED_ATTEMPTS = 9

#  SMP_NUMERIC_COMPAR_FAIL = 12

system/stack/smp/smp_act.cc

+8 −0
Original line number Diff line number Diff line
@@ -544,6 +544,14 @@ void smp_proc_pair_cmd(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  STREAM_TO_UINT8(p_cb->peer_i_key, p);

  STREAM_TO_UINT8(p_cb->peer_r_key, p);



  tSMP_STATUS reason = p_cb->cert_failure;

  if (reason == SMP_ENC_KEY_SIZE) {

    tSMP_INT_DATA smp_int_data;

    smp_int_data.status = reason;

    smp_sm_event(p_cb, SMP_AUTH_CMPL_EVT, &smp_int_data);

    return;

  }



  if (smp_command_has_invalid_parameters(p_cb)) {

    tSMP_INT_DATA smp_int_data;

    smp_int_data.status = SMP_INVALID_PARAMETERS;