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

Commit a965ddb9 authored by Brian Delwiche's avatar Brian Delwiche Committed by Automerger Merge Worker
Browse files

Reject encryption drop in Common Criteria mode am: 1ee290b8 am: 5f41286a am: c5186de5 

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



Change-Id: I2d0a1577b3ad2de6b683d110eb14a7346728b225
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 853f4c7d c5186de5

system/stack/acl/btm_acl.cc

+18 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include "main/shim/dumpsys.h"

#include "main/shim/l2c_api.h"

#include "main/shim/shim.h"

#include "os/parameter_provider.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"  // UNUSED_ATTR
@@ -650,6 +651,23 @@ void btm_acl_encrypt_change(uint16_t handle, uint8_t status, 
    return;

  }



  /* Common Criteria mode only: if we are trying to drop encryption on an

   * encrypted connection, drop the connection */

  if (bluetooth::os::ParameterProvider::IsCommonCriteriaMode()) {

    if (p->is_encrypted && !encr_enable) {

      LOG(ERROR)

          << __func__

          << " attempting to decrypt encrypted connection, disconnecting. "

             "handle: "

          << loghex(handle);



      acl_disconnect_from_handle(handle, HCI_ERR_HOST_REJECT_SECURITY,

                                 "stack::btu::btu_hcif::read_drop_encryption "

                                 "Connection Already Encrypted");

      return;

    }

  }



  p->is_encrypted = encr_enable;



  /* Process Role Switch if active */