[mynewt-nimble] branch master updated: nimble/ll: Fix encryption pause

[ry...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rymek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new 6a93c41  nimble/ll: Fix encryption pause
6a93c41 is described below

commit 6a93c415c2f58988d16fb08c35af471693add381
Author: Łukasz Rymanowski <lu...@codecoup.pl>
AuthorDate: Wed Jan 16 20:11:59 2019 +0100

    nimble/ll: Fix encryption pause
    
    Patch: 479eceb5 nimble/ll: Fix handling LL_PAUSE_ENC_REQ
    was incorrect because the intention was to handle LL_PAUSE_ENC_RSP as a
    slave there. This patch fixes this but if moves handling it into
    ble_ll_ctrl.c.
    
    This fix regression on LL/SEC/SLA/BV-02-C
---
 nimble/controller/src/ble_ll_conn.c | 6 ------
 nimble/controller/src/ble_ll_ctrl.c | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c
index 992b6ab..b6561a7 100644
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@ -3989,12 +3989,6 @@ chk_rx_terminate_ind:
         } else {
             /* A slave always replies */
             reply = 1;
-#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
-            if (is_ctrl && (opcode == BLE_LL_CTRL_PAUSE_ENC_REQ)
-                        && (rx_pyld_len == (1 + BLE_LL_CTRL_PAUSE_ENC_REQ_LEN))) {
-                connsm->enc_data.enc_state = CONN_ENC_S_PAUSED;
-            }
-#endif
         }
     }
 
diff --git a/nimble/controller/src/ble_ll_ctrl.c b/nimble/controller/src/ble_ll_ctrl.c
index 26cece9..781987c 100644
--- a/nimble/controller/src/ble_ll_ctrl.c
+++ b/nimble/controller/src/ble_ll_ctrl.c
@@ -1359,6 +1359,12 @@ ble_ll_ctrl_rx_pause_enc_rsp(struct ble_ll_conn_sm *connsm)
 
     if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
         rc = BLE_LL_CTRL_PAUSE_ENC_RSP;
+    } else if (connsm->enc_data.enc_state == CONN_ENC_S_PAUSE_ENC_RSP_WAIT) {
+        /* Master sends back unencrypted LL_PAUSE_ENC_RSP.
+         * From this moment encryption is paused.
+         */
+        rc = BLE_ERR_MAX;
+        connsm->enc_data.enc_state = CONN_ENC_S_PAUSED;
     } else {
         rc = BLE_LL_CTRL_UNKNOWN_RSP;
     }