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

Commit 23bc452a authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes Ib93760e9,I6da2007d,I07912505,I941ca006,Ib3f5b0de, ... into main 

* changes:
  Security: Move parsing to HCI: sec requests
  Security: Move parsing to HCI: local OOB
  Security: Move parsing to HCI: Remote OOB
  Security: Move parsing to HCI: SP complete
  Security: Move parsing to HCI: IO Cap Rsp
  Security: Move parsing to HCI: cancel complete
  Use a single crypto_toolbox (GD)
  HCI: Add error codes in 5.3 to PDL
parents 2481a025 84ff0696

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ cc_library_shared { 
        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_core_rs_bridge",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-bta",

system/audio_hal_interface/fuzzer/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ cc_defaults { 
        "libbluetooth-protos",

        "libbluetooth-types",

        "libbluetooth_core_rs",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbluetooth_rust_interop",

        "libbt-audio-hal-interface",

system/bta/Android.bp

+13 −9
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ cc_library_static { 
    static_libs: [

        "avrcp-target-service",

        "lib-bt-packets",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-bta-core",

        "libbt-platform-protos-lite",
@@ -265,9 +266,9 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbt-audio-hal-interface",
@@ -324,8 +325,8 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbt-audio-hal-interface",
@@ -368,8 +369,8 @@ cc_test { 
        "libstatssocket",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-bta",
@@ -485,8 +486,8 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",
@@ -533,8 +534,8 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",
@@ -591,8 +592,8 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",
@@ -741,6 +742,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",
@@ -842,6 +844,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt-platform-protos-lite",
@@ -922,8 +925,8 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-audio-hal-interface",

        "libbt-common",
@@ -1003,6 +1006,7 @@ cc_test { 
    ],

    static_libs: [

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",
@@ -1132,8 +1136,8 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbt-common",

        "libbt_shim_bridge",
@@ -1196,9 +1200,9 @@ cc_test { 
        "liblog",

    ],

    static_libs: [

        "crypto_toolbox_for_tests",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbt-common",

system/bta/csis/csis_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "bta_groups.h"

#include "bta_sec_api.h"

#include "btif_storage.h"

#include "crypto_toolbox/crypto_toolbox.h"

#include "csis_types.h"

#include "gap_api.h"

#include "gatt_api.h"
@@ -44,7 +45,6 @@ 
#include "osi/include/stack_power_telemetry.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_sec.h"

#include "stack/crypto_toolbox/crypto_toolbox.h"

#include "stack/gatt/gatt_int.h"

#include "stack/include/btm_ble_sec_api.h"

system/bta/csis/csis_types.h

+3 −3
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 
#include "bta_gatt_api.h"

#include "bta_groups.h"

#include "btif_storage.h"

#include "common/init_flags.h"

#include "common/strings.h"

#include "crypto_toolbox/crypto_toolbox.h"

#include "gap_api.h"

#include "gd/common/init_flags.h"

#include "gd/common/strings.h"

#include "stack/crypto_toolbox/crypto_toolbox.h"



// Uncomment to debug SIRK calculations

// #define CSIS_DEBUG