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

Commit 1426f7af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SMP: Reject pairing if public_key.x match" into sc-dev am: 18444090 

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

Change-Id: I67d14a19f35aefdba5155b1c81cddebf48e53f10
parents 08380b65 18444090

system/gd/security/pairing_handler_le_secure_connections.cc

+5 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ std::variant<PairingFailure, KeyExchangeResult> PairingHandlerLe::ExchangePublic 
  remote_public_key.y = ppkv.GetPublicKeyY();

  LOG_INFO("Received Public key from remote");



  if (public_key.x == remote_public_key.x) {

    LOG_INFO("Remote and local public keys can't match");

    return PairingFailure("Remote and local public keys match");

  }



  // validate received public key

  if (!ValidateECDHPoint(remote_public_key)) {

    // TODO: Spec is unclear what should happend when the point is not on

system/stack/smp/smp_act.cc

+1 −2
Original line number Diff line number Diff line
@@ -695,8 +695,7 @@ void smp_process_pairing_public_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  memcpy(pt.x, p_cb->peer_publ_key.x, BT_OCTET32_LEN);

  memcpy(pt.y, p_cb->peer_publ_key.y, BT_OCTET32_LEN);



  if (!memcmp(p_cb->peer_publ_key.x, p_cb->loc_publ_key.x, BT_OCTET32_LEN) &&

      !memcmp(p_cb->peer_publ_key.y, p_cb->loc_publ_key.y, BT_OCTET32_LEN)) {

  if (!memcmp(p_cb->peer_publ_key.x, p_cb->loc_publ_key.x, BT_OCTET32_LEN)) {

    android_errorWriteLog(0x534e4554, "174886838");

    SMP_TRACE_WARNING("Remote and local public keys can't match");

    tSMP_INT_DATA smp;