mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 08:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

GAP update to higher security level working

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2014-01-17 12:01:32 +00:00
parent 1eb2563e8a
commit fb8ba0dbcd
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/libusb/spp_counter.c
View File

@ -149,6 +149,8 @@ void setup(void){
sdp_create_spp_service( spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter"); sdp_create_spp_service( spp_service_buffer, RFCOMM_SERVER_CHANNEL, "SPP Counter");
printf("SDP service record size: %u\n\r", de_get_len(spp_service_buffer)); printf("SDP service record size: %u\n\r", de_get_len(spp_service_buffer));
sdp_register_service_internal(NULL, spp_service_buffer); sdp_register_service_internal(NULL, spp_service_buffer);
hci_ssp_set_io_capability(SSP_IO_CAPABILITY_DISPLAY_YES_NO);
} }
// main == setup // main == setup

18
include/btstack/hci_cmds.h
View File

@ -311,6 +311,24 @@ extern "C" {
* SSP Authentication Requirements, see IO Capability Request Reply Commmand * SSP Authentication Requirements, see IO Capability Request Reply Commmand
*/ */
// Numeric comparison with automatic accept allowed.
#define SSP_IO_AUTHREQ_MITM_PROTECTION_NOT_REQUIRED_NO_BONDING 0x00
// Use IO Capabilities to deter- mine authentication procedure
#define SSP_IO_AUTHREQ_MITM_PROTECTION_REQUIRED_NO_BONDING 0x01
// Numeric compar- ison with automatic accept allowed.
#define SSP_IO_AUTHREQ_MITM_PROTECTION_NOT_REQUIRED_DEDICATED_BONDING 0x02
// Use IO Capabilities to determine authentication procedure
#define SSP_IO_AUTHREQ_MITM_PROTECTION_REQUIRED_DEDICATED_BONDING 0x03
// Numeric Compari- son with automatic accept allowed.
#define SSP_IO_AUTHREQ_MITM_PROTECTION_NOT_REQUIRED_GENERAL_BONDING 0x04
// . Use IO capabilities to determine authentication procedure.
#define SSP_IO_AUTHREQ_MITM_PROTECTION_REQUIRED_GENERAL_BONDING 0x05
/** /**
* Hardware state of Bluetooth controller * Hardware state of Bluetooth controller
*/ */

7
src/hci.c
View File

@ -714,7 +714,6 @@ static void event_handler(uint8_t *packet, int size){
if (gap_security_level_for_link_key_type(conn->link_key_type) >= conn->requested_security_level){ if (gap_security_level_for_link_key_type(conn->link_key_type) >= conn->requested_security_level){
// link key sufficient for requested security // link key sufficient for requested security
conn->bonding_flags |= BONDING_SEND_ENCRYPTION_REQUEST; conn->bonding_flags |= BONDING_SEND_ENCRYPTION_REQUEST;
return;
} else { } else {
// not enough // not enough
hci_emit_security_level(handle, gap_security_level_for_connection(conn)); hci_emit_security_level(handle, gap_security_level_for_connection(conn));
@ -1824,7 +1823,7 @@ void gap_request_security_level(hci_con_handle_t con_handle, gap_security_level_
connection->requested_security_level = requested_level; connection->requested_security_level = requested_level;
// would enabling ecnryption suffice? // would enabling ecnryption suffice (>= LEVEL_2)?
if (hci_stack.remote_device_db){ if (hci_stack.remote_device_db){
link_key_type_t link_key_type; link_key_type_t link_key_type;
link_key_t link_key; link_key_t link_key;
@ -1836,7 +1835,9 @@ void gap_request_security_level(hci_con_handle_t con_handle, gap_security_level_
} }
} }
// setup SSP AuthRequirements, we need MITM to go higher
hci_stack.ssp_authentication_requirement |= 1; // MITM required
// try to authenticate connection // try to authenticate connection
connection->bonding_flags |= BONDING_SEND_AUTHENTICATE_REQUEST; connection->bonding_flags |= BONDING_SEND_AUTHENTICATE_REQUEST;
// connection->bonding_flags |= BONDING_REQUESTED;
} }

5
src/hci.h
View File

@ -237,9 +237,8 @@ typedef enum {
BONDING_RECEIVED_REMOTE_FEATURES = 0x02, BONDING_RECEIVED_REMOTE_FEATURES = 0x02,
BONDING_REMOTE_SUPPORTS_SSP = 0x04, BONDING_REMOTE_SUPPORTS_SSP = 0x04,
BONDING_DISCONNECT_SECURITY_BLOCK = 0x08, BONDING_DISCONNECT_SECURITY_BLOCK = 0x08,
BONDING_REQUESTED = 0x10, BONDING_SEND_AUTHENTICATE_REQUEST = 0x10,
BONDING_SEND_AUTHENTICATE_REQUEST = 0x20, BONDING_SEND_ENCRYPTION_REQUEST = 0x20,
BONDING_SEND_ENCRYPTION_REQUEST = 0x40,
} bonding_flags_t; } bonding_flags_t;
typedef enum { typedef enum {

2
src/l2cap.c
View File

@ -840,7 +840,7 @@ static void l2cap_handle_connection_request(hci_con_handle_t handle, uint8_t sig
if (psm != PSM_SDP if (psm != PSM_SDP
&& hci_local_ssp_activated() && hci_local_ssp_activated()
&& hci_remote_ssp_supported(handle) && hci_remote_ssp_supported(handle)
&& gap_security_level(handle) == LEVEL_0){ && gap_security_level(handle) == LEVEL_3){
// 0x0003 Security Block // 0x0003 Security Block
l2cap_register_signaling_response(handle, CONNECTION_REQUEST, sig_id, 0x0003); l2cap_register_signaling_response(handle, CONNECTION_REQUEST, sig_id, 0x0003);