mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-27 06:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

reject l2cap connection if secruity level not reached after auhentication

Browse Source
This commit is contained in:
matthias.ringwald@gmail.com 2014-01-17 11:33:22 +00:00
parent a00031e215
commit 1eb2563e8a
3 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/hci.c
View File

@ -707,11 +707,19 @@ static void event_handler(uint8_t *packet, int size){
hci_emit_security_level(handle, gap_security_level_for_connection(conn));
break;
// case HCI_EVENT_AUTHENTICATION_COMPLETE_EVENT:
// handle = READ_BT_16(packet, 3);
// conn = hci_connection_for_handle(handle);
// if (!conn) break;
// break;
case HCI_EVENT_AUTHENTICATION_COMPLETE_EVENT:
handle = READ_BT_16(packet, 3);
conn = hci_connection_for_handle(handle);
if (!conn) break;
if (gap_security_level_for_link_key_type(conn->link_key_type) >= conn->requested_security_level){
// link key sufficient for requested security
conn->bonding_flags |= BONDING_SEND_ENCRYPTION_REQUEST;
return;
} else {
// not enough
hci_emit_security_level(handle, gap_security_level_for_connection(conn));
}
break;
#ifndef EMBEDDED
case HCI_EVENT_REMOTE_NAME_REQUEST_COMPLETE:
@ -1828,6 +1836,7 @@ void gap_request_security_level(hci_con_handle_t con_handle, gap_security_level_
}
}
// try to authenticate connection
connection->bonding_flags |= BONDING_SEND_AUTHENTICATE_REQUEST;
// connection->bonding_flags |= BONDING_REQUESTED;
// connection->bonding_flags |= BONDING_SEND_AUTHENTICATE_REQUEST;
}

28
src/l2cap.c
View File

@ -511,7 +511,7 @@ void l2cap_run(void){
break;
case L2CAP_STATE_WILL_SEND_CONNECTION_RESPONSE_DECLINE:
l2cap_send_signaling_packet(channel->handle, CONNECTION_RESPONSE, channel->remote_sig_id, 0, 0, channel->reason, 0);
l2cap_send_signaling_packet(channel->handle, CONNECTION_RESPONSE, channel->remote_sig_id, channel->local_cid, channel->remote_cid, channel->reason, 0);
// discard channel - l2cap_finialize_channel_close without sending l2cap close event
linked_list_remove(&l2cap_channels, (linked_item_t *) channel); // -- remove from list
btstack_memory_l2cap_channel_free(channel);
@ -775,14 +775,21 @@ void l2cap_event_handler( uint8_t *packet, uint16_t size ){
handle = READ_BT_16(packet, 2);
for (it = (linked_item_t *) l2cap_channels; it ; it = it->next){
channel = (l2cap_channel_t *) it;
gap_security_level_t actual_level = packet[4];
log_info("GAP_SECURITY_LEVEL handle %x/%x level %u, state %u", handle, channel->handle, actual_level, channel->state);
if (channel->handle != handle) continue;
log_info("handle ok");
if (channel->state != L2CAP_STATE_WAIT_SECURITY_LEVEL_UPDATE) continue;
// @todo check security level again
// channel->reason = 0x03; // security block
// channel->state = L2CAP_STATE_WILL_SEND_CONNECTION_RESPONSE_DECLINE;
// success
channel->state = L2CAP_STATE_WAIT_CLIENT_ACCEPT_OR_REJECT;
l2cap_emit_connection_request(channel);
log_info("state ok");
if (actual_level >= channel->required_security_level){
log_info("level ok");
channel->state = L2CAP_STATE_WAIT_CLIENT_ACCEPT_OR_REJECT;
l2cap_emit_connection_request(channel);
} else {
log_info("level nok");
channel->reason = 0x03; // security block
channel->state = L2CAP_STATE_WILL_SEND_CONNECTION_RESPONSE_DECLINE;
}
}
break;
@ -862,6 +869,7 @@ static void l2cap_handle_connection_request(hci_con_handle_t handle, uint8_t sig
channel->remote_mtu = L2CAP_DEFAULT_MTU;
channel->packets_granted = 0;
channel->remote_sig_id = sig_id;
channel->required_security_level = LEVEL_0; // @TODO get from 'security database'
// limit local mtu to max acl packet length
if (channel->local_mtu > l2cap_max_mtu()) {
@ -876,8 +884,7 @@ static void l2cap_handle_connection_request(hci_con_handle_t handle, uint8_t sig
linked_list_add(&l2cap_channels, (linked_item_t *) channel);
// assert security requirements
gap_security_level_t required_level = LEVEL_0;
gap_request_security_level(handle, required_level);
gap_request_security_level(handle, channel->required_security_level);
}
void l2cap_accept_connection_internal(uint16_t local_cid){
@ -1186,8 +1193,6 @@ void l2cap_acl_handler( uint8_t *packet, uint16_t size ){
break;
}
}
l2cap_run();
}
static void l2cap_packet_handler(uint8_t packet_type, uint8_t *packet, uint16_t size){
@ -1201,6 +1206,7 @@ static void l2cap_packet_handler(uint8_t packet_type, uint8_t *packet, uint16_t
default:
break;
}
l2cap_run();
}
// finalize closed channel - l2cap_handle_disconnect_request & DISCONNECTION_RESPONSE

2
src/l2cap.h
View File

@ -146,6 +146,8 @@ typedef struct {
uint16_t psm;
gap_security_level_t required_security_level;
uint8_t packets_granted; // number of L2CAP/ACL packets client is allowed to send
uint8_t reason; // used in decline internal