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

sm: fix decline bonding for secure connections

Browse Source
This commit is contained in:
Matthias Ringwald 2018-03-31 21:38:25 +02:00
parent 644c6a1da3
commit 0af429c6ec
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/ble/sm.c
View File

@ -3567,9 +3567,18 @@ static void sm_pdu_handler(uint8_t packet_type, hci_con_handle_t con_handle, uin
sm_pdu_received_in_wrong_state(sm_conn); sm_pdu_received_in_wrong_state(sm_conn);
break; break;
} }
// store pairing request // store pairing request
memcpy(&setup->sm_s_pres, packet, sizeof(sm_pairing_packet_t)); memcpy(&setup->sm_s_pres, packet, sizeof(sm_pairing_packet_t));
err = sm_stk_generation_init(sm_conn); err = sm_stk_generation_init(sm_conn);
#ifdef ENABLE_TESTING_SUPPORT
if (0 < test_pairing_failure && test_pairing_failure < SM_REASON_DHKEY_CHECK_FAILED){
log_info("testing_support: abort with pairing failure %u", test_pairing_failure);
err = test_pairing_failure;
}
#endif
if (err){ if (err){
setup->sm_pairing_failed_reason = err; setup->sm_pairing_failed_reason = err;
sm_conn->sm_engine_state = SM_GENERAL_SEND_PAIRING_FAILED; sm_conn->sm_engine_state = SM_GENERAL_SEND_PAIRING_FAILED;
@ -4170,22 +4179,31 @@ void sm_bonding_decline(hci_con_handle_t con_handle){
sm_connection_t * sm_conn = sm_get_connection_for_handle(con_handle); sm_connection_t * sm_conn = sm_get_connection_for_handle(con_handle);
if (!sm_conn) return; // wrong connection if (!sm_conn) return; // wrong connection
setup->sm_user_response = SM_USER_RESPONSE_DECLINE; setup->sm_user_response = SM_USER_RESPONSE_DECLINE;
log_info("decline, state %u", sm_conn->sm_engine_state);
if (sm_conn->sm_engine_state == SM_PH1_W4_USER_RESPONSE){ switch(sm_conn->sm_engine_state){
switch (setup->sm_stk_generation_method){ #ifdef ENABLE_LE_SECURE_CONNECTIONS
case PK_RESP_INPUT: case SM_SC_W4_USER_RESPONSE:
case PK_INIT_INPUT: case SM_SC_W4_CONFIRMATION:
case OK_BOTH_INPUT: case SM_SC_W4_PUBLIC_KEY_COMMAND:
sm_pairing_error(sm_conn, SM_GENERAL_SEND_PAIRING_FAILED); #endif
break; case SM_PH1_W4_USER_RESPONSE:
case NK_BOTH_INPUT: switch (setup->sm_stk_generation_method){
sm_pairing_error(sm_conn, SM_REASON_NUMERIC_COMPARISON_FAILED); case PK_RESP_INPUT:
break; case PK_INIT_INPUT:
case JUST_WORKS: case OK_BOTH_INPUT:
case OOB: sm_pairing_error(sm_conn, SM_REASON_PASSKEY_ENTRY_FAILED);
sm_pairing_error(sm_conn, SM_REASON_UNSPECIFIED_REASON); break;
break; case NK_BOTH_INPUT:
} sm_pairing_error(sm_conn, SM_REASON_NUMERIC_COMPARISON_FAILED);
break;
case JUST_WORKS:
case OOB:
sm_pairing_error(sm_conn, SM_REASON_UNSPECIFIED_REASON);
break;
}
break;
default:
break;
} }
sm_run(); sm_run();
} }