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

Commit 1a0528ee authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bluetooth_oob_api" into sc-dev am: 8c09989e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/15145442

Change-Id: I58d2c0892f7a37869f2fb6fa3112f0ff3396d0e9
parents ca19dd68 8c09989e

system/stack/smp/smp_keys.cc

+5 −6
Original line number Diff line number Diff line
@@ -597,12 +597,11 @@ void smp_create_private_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
    // out, so if the advertiser times out we want the pairing to fail anyway.

    if (!is_empty(&saved_local_oob_data)) {

      LOG_WARN("Found OOB data, loading keys");

      memcpy(p_cb->private_key, saved_local_oob_data.private_key_used,

             BT_OCTET32_LEN);

      memcpy(p_cb->loc_publ_key.x, saved_local_oob_data.publ_key_used.x,

             BT_OCTET32_LEN);

      memcpy(p_cb->loc_publ_key.y, saved_local_oob_data.publ_key_used.y,

             BT_OCTET32_LEN);

      for (int i = 0; i < BT_OCTET32_LEN; i++) {

        p_cb->private_key[i] = saved_local_oob_data.private_key_used[i];

        p_cb->loc_publ_key.x[i] = saved_local_oob_data.publ_key_used.x[i];

        p_cb->loc_publ_key.y[i] = saved_local_oob_data.publ_key_used.y[i];

      }

      p_cb->sc_oob_data.loc_oob_data = saved_local_oob_data;

      p_cb->local_random = saved_local_oob_data.randomizer;

      smp_process_private_key(p_cb);