From dd583d9fc5bd3a3becbf409534e939dbe18a66eb Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Wed, 4 Nov 2020 16:06:30 +0100 Subject: [PATCH] sm: fix update of sc flag for re-encrypted connection in peripheral role # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 3 ++- src/ble/sm.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f7ccc3da..3f13acea9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Changes November 2020 ### Fixed -L2CAP: trigger pairing for outgoing LE Data Channels if security level insufficient +- L2CAP: trigger pairing for outgoing LE Data Channels if security level insufficient +- SM: fix update of sc flag for re-encrypted connection in peripheral role ### Added diff --git a/src/ble/sm.c b/src/ble/sm.c index 4e64bd169..97ce1bc45 100644 --- a/src/ble/sm.c +++ b/src/ble/sm.c @@ -3443,7 +3443,6 @@ static void sm_event_packet_handler (uint8_t packet_type, uint16_t channel, uint } if (!sm_conn->sm_connection_encrypted) break; - sm_conn->sm_connection_sc = setup->sm_use_secure_connections; // continue pairing switch (sm_conn->sm_engine_state){ @@ -3452,6 +3451,7 @@ static void sm_event_packet_handler (uint8_t packet_type, uint16_t channel, uint sm_done_for_handle(sm_conn->sm_handle); break; case SM_PH2_W4_CONNECTION_ENCRYPTED: + sm_conn->sm_connection_sc = setup->sm_use_secure_connections; if (IS_RESPONDER(sm_conn->sm_role)){ // slave if (setup->sm_use_secure_connections){