| commit | 83a03991b19a97d8737840bceef7ff81a2e025b1 | [log] [tgz] |
|---|---|---|
| author | Brian Delwiche <delwiche@google.com> | Tue Mar 21 22:39:16 2023 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Tue Apr 18 22:43:07 2023 +0000 |
| tree | c64750e86b4e08aa9f3ffbdfe328644ee18f933f | |
| parent | b92be5529a39fc2d10aa70ba23a703224fcd17f2 [diff] |
Revert "Revert "Fix wrong BR/EDR link key downgrades (P_256->P_192)"" This reverts commit d733c86cbc06ce0ec72216b9d41e172d1939c46f. Function btm_sec_encrypt_change() is called at most places with argument "encr_enable" treated as bool and not as per (tHCI_ENCRYPT_MODE = 0/1/2) expected by the function. The function has special handling for "encr_enable=1" to downgrade the link key type for BR/EDR case. This gets executed even when the caller/context did not mean/expect so. It appears this handling in btm_sec_encrypt_change() is not necessary and is removed by this commit to prevent accidental execution of it. Test: Verified re-pairing with an iPhone works fine now Issue Reproduction Steps: 1. Enable Bluetooth Hotspot on Android device (DUT). 2. Pair and connect an iPhone to DUT. 3. Forget this pairing on DUT. 4. On iPhone settings, click on old DUT's paired entry to connect. 5. iPhone notifies to click 'Forget Device' and try fresh pairing. 6. On iPhone, after doing 'Forget Device', discover DUT again. 7. Attempt pairing to DUT by clicking on discovered DUT entry. Pairing will be unsuccessful. Issue Cause: During re-pairing, DUT is seen to downgrade BR/EDR link key unexpectedly from link key type 0x8 (BTM_LKEY_TYPE_AUTH_COMB_P_256) to 0x5 (BTM_LKEY_TYPE_AUTH_COMB). Log snippet (re-pairing time): btm_sec_link_key_notification set new_encr_key_256 to 1 btif_dm_auth_cmpl_evt: Storing link key. key_type=0x8, bond_type=1 btm_sec_encrypt_change new_encr_key_256 is 1 --On DUT, HCI_Encryption_Key_Refresh_Complete event noticed--- btm_sec_encrypt_change new_encr_key_256 is 0 updated link key type to 5 btif_dm_auth_cmpl_evt: Storing link key. key_type=0x5, bond_type=1 This is a backport of the following patch: aosp/1890096 Bug: 258834033 Reason for revert: Reinstate original change for QPR (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:56891eedc68c86b40977191dad28d65ebf86a94f) Merged-In: Iba0c220b82bcf6b15368762b7052a3987ccbc0c6 Change-Id: Iba0c220b82bcf6b15368762b7052a3987ccbc0c6
Just build AOSP - Fluoride is there by default.
Instructions for a Debian based distribution:
You‘ll want to download some pre-requisite packages as well. If you’re currently configured for AOSP development, you should have all required packages. Otherwise, you can use the following apt-get list:
sudo apt-get install repo git-core gnupg flex bison gperf build-essential \ zip curl zlib1g-dev gcc-multilib g++-multilib \ x11proto-core-dev libx11-dev lib32z-dev libncurses5 \ libgl1-mesa-dev libxml2-utils xsltproc unzip liblz4-tool libssl-dev \ libc++-dev libevent-dev \ flatbuffers-compiler libflatbuffers1 \ openssl openssl-dev
You will also need a recent-ish version of Rust and Cargo. Please follow the instructions on Rustup to install a recent version.
mkdir ~/fluoride cd ~/fluoride git clone https://android.googlesource.com/platform/system/bt
Install dependencies (require sudo access). This adds some Ubuntu dependencies and also installs GN (which is the build tool we're using).
cd ~/fluoride/bt build/install_deps.sh
The following third-party dependencies are necessary but currently unavailable via a package manager. You may have to build these from source and install them to your local environment.
We provide a script to produce debian packages for those components, please follow the instructions in build/dpkg/README.txt.
The googletest packages provided by Debian/Ubuntu (libgmock-dev and libgtest-dev) do not provide pkg-config files, so you can build your own googletest using the steps below:
$ git clone https://github.com/google/googletest.git -b release-1.10.0 $ cd googletest # Main directory of the cloned repository. $ mkdir build # Create a directory to hold the build output. $ cd build $ cmake .. # Generate native build scripts for GoogleTest. $ sudo make install -DCMAKE_INSTALL_PREFIX=/usr
For host build, we depend on a few other repositories:
Clone these all somewhere and create your staging environment.
export STAGING_DIR=path/to/your/staging/dir mkdir ${STAGING_DIR} mkdir -p ${STAGING_DIR}/external ln -s $(readlink -f ${PLATFORM2_DIR}/common-mk) ${STAGING_DIR}/common-mk ln -s $(readlink -f ${PLATFORM2_DIR}/.gn) ${STAGING_DIR}/.gn ln -s $(readlink -f ${RUST_CRATE_DIR}) ${STAGING_DIR}/external/rust ln -s $(readlink -f ${PROTO_LOG_DIR}) ${STAGING_DIR}/external/proto_logging
We provide a build script to automate building assuming you've staged your build environment already as above.
./build.py --output ${OUTPUT_DIR} --platform-dir ${STAGING_DIR} --clang
This will build all targets to the output directory you've given. You can also build each stage separately (if you want to iterate on something specific):
You can choose to run only a specific stage by passing an arg via --target.
Currently, Rust builds are a separate stage that uses Cargo to build. See gd/rust/README.md for more information.
By default on Linux, we statically link libbluetooth so you can just run the binary directly:
cd ~/fluoride/bt/out/Default ./bluetoothtbd -create-ipc-socket=fluoride