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

Commit 64eaad26 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "system/stack/smp: Fix -Wmissing-prototype errors" into main

parents 30c625bb 28286ee9

system/stack/btm/btm_sec.cc

+0 −3
Original line number Diff line number Diff line
@@ -3424,9 +3424,6 @@ static void read_encryption_key_size_complete_after_encryption_change(uint8_t st 
  btm_sec_encrypt_change(handle, static_cast<tHCI_STATUS>(status), 1 /* enable */, key_size);

}



// TODO: Remove

void smp_cancel_start_encryption_attempt();



/*******************************************************************************

 *

 * Function         btm_encryption_change_evt

system/stack/btu/btu_hcif.cc

+1 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include "stack/include/main_thread.h"

#include "stack/include/sco_hci_link_interface.h"

#include "stack/include/sec_hci_link_interface.h"

#include "stack/include/smp_api.h"

#include "stack/include/stack_metrics_logging.h"

#include "types/hci_role.h"

#include "types/raw_address.h"
@@ -68,7 +69,6 @@ using bluetooth::hci::IsoManager; 


bool BTM_BLE_IS_RESOLVE_BDA(const RawAddress& x);  // TODO remove

void BTA_sys_signal_hw_error();                    // TODO remove

void smp_cancel_start_encryption_attempt();        // TODO remove

void acl_disconnect_from_handle(uint16_t handle, tHCI_STATUS reason,

                                std::string comment);  // TODO remove

system/stack/include/smp_api.h

+2 −0
Original line number Diff line number Diff line
@@ -207,4 +207,6 @@ bool smp_proc_ltk_request(const RawAddress& bda); 
// Proceed to send LTK, DIV and ER to central if bonding the devices.

void smp_link_encrypted(const RawAddress& bda, uint8_t encr_enable);



void smp_cancel_start_encryption_attempt();



#endif /* SMP_API_H */

system/stack/smp/smp_act.cc

+1 −3
Original line number Diff line number Diff line
@@ -39,12 +39,10 @@ 
#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/btm_status.h"

#include "stack/include/smp_api.h"

#include "stack/include/smp_api_types.h"

#include "types/raw_address.h"



// TODO(b/369381361) Enfore -Wmissing-prototypes

#pragma GCC diagnostic ignored "-Wmissing-prototypes"



using namespace bluetooth;



namespace {

system/stack/smp/smp_int.h

+4 −0
Original line number Diff line number Diff line
@@ -489,6 +489,10 @@ void smp_start_nonce_generation(tSMP_CB* p_cb); 
bool smp_calculate_link_key_from_long_term_key(tSMP_CB* p_cb);

bool smp_calculate_long_term_key_from_link_key(tSMP_CB* p_cb);



Octet16 smp_gen_p1_4_confirm(tSMP_CB* p_cb, tBLE_ADDR_TYPE remote_bd_addr_type);

Octet16 smp_gen_p2_4_confirm(tSMP_CB* p_cb, const RawAddress& remote_bda);

tSMP_STATUS smp_calculate_confirm(tSMP_CB* p_cb, const Octet16& rand, Octet16* output);



void print128(const Octet16& x, const char* key_name);

void smp_xor_128(Octet16* a, const Octet16& b);