Merge pull request #7166 from paul-szczepanek-arm/fix-cancel-pairing

Cruz Monrreal · web-flow · commit fff3564012a6 · 2018-06-13T08:45:46.000-05:00
BLE: fix pairing for misconfigured devices (deny pairing correctly)
diff --git a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
@@ -1144,6 +1144,7 @@ void GenericSecurityManager::on_pairing_request(
     /* cancel pairing if secure connection paring is not possible */
     if (!_legacy_pairing_allowed && !authentication.get_secure_connections()) {
         cancelPairingRequest(connection);
+        return;
     }
 
     ControlBlock_t *cb = get_control_block(connection);

Original file line number	Diff line number	Diff line change
`@@ -1144,6 +1144,7 @@ void GenericSecurityManager::on_pairing_request(`
`1144`	`1144`	`/* cancel pairing if secure connection paring is not possible */`
`1145`	`1145`	`if (!_legacy_pairing_allowed && !authentication.get_secure_connections()) {`
`1146`	`1146`	`cancelPairingRequest(connection);`
	`1147`	`+ return;`
`1147`	`1148`	`}`
`1148`	`1149`
`1149`	`1150`	`ControlBlock_t *cb = get_control_block(connection);`