Skip to content

BLE: call secure connections versions of ltk functions #7688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Aug 9, 2018
Merged

BLE: call secure connections versions of ltk functions #7688

merged 5 commits into from
Aug 9, 2018

Conversation

paul-szczepanek-arm
Copy link
Member

Description

NRF implementation of the security manager called legacy pairing functions for storing the ltk instead of the secure connections versions which need to be called for correct flags to be set.

Pull request type

[x] Fix
[ ] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

@paul-szczepanek-arm paul-szczepanek-arm mentioned this pull request Aug 3, 2018
Merged
@0xc0170
Copy link
Contributor

0xc0170 commented Aug 3, 2018

/morph build

@cmonr
Copy link
Contributor

cmonr commented Aug 3, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Aug 4, 2018

Build : FAILURE

Build number : 2733
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7688/

@NirSonnenschein
Copy link
Contributor

seems to fail to the ci-morph-build on the NRF52840_DK. Since the changes seem to affect this board I'm assuming this is not coincidental.

@paul-szczepanek-arm
Copy link
Member Author

that sdk doesn't support that feature so replaced it with an uglier but more compatible check, should be good to go

@0xc0170
Copy link
Contributor

0xc0170 commented Aug 6, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Aug 6, 2018

Build : SUCCESS

Build number : 2737
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7688/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

pan-
pan- requested changes Aug 6, 2018
View reviewed changes
features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp Outdated
@@ -948,34 +956,44 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
peer_dist = pairing_cb->initiator_dist;
}

if (own_dist.get_encryption()) {
handler->on_keys_distributed_local_ltk(
uint8_t invalid_rand[BLE_GAP_SEC_RAND_LEN] = { 0 };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you factorize the test in a function ? It is used to handle BLE_GAP_EVT_SEC_INFO_REQUEST too.
Note that if it is in a function a for loop can be used to minimize stack allocation.

@mbed-ci
Copy link

mbed-ci commented Aug 6, 2018

Exporter Build : SUCCESS

Build number : 2371
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7688/

@mbed-ci
Copy link

mbed-ci commented Aug 6, 2018

Test : SUCCESS

Build number : 2464
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/7688/2464

@cmonr cmonr removed the needs: CI label Aug 6, 2018
@donatieng donatieng mentioned this pull request Aug 8, 2018
Merged
@cmonr
Copy link
Contributor

cmonr commented Aug 8, 2018

/morph build

@cmonr
Copy link
Contributor

cmonr commented Aug 8, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Aug 8, 2018

Build : SUCCESS

Build number : 2765
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7688/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Aug 8, 2018

Exporter Build : SUCCESS

Build number : 2394
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7688/

@mbed-ci
Copy link

mbed-ci commented Aug 9, 2018

Test : SUCCESS

Build number : 2491
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/7688/2491

@cmonr cmonr merged commit 2b92b26 into ARMmbed:master Aug 9, 2018
pan- pushed a commit to pan-/mbed that referenced this pull request Aug 22, 2018
Merge pull request ARMmbed#7688 from paul-szczepanek-arm/nrf-ltk-fix
c7aa126 
BLE: call secure connections versions of ltk functions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pan- pan- pan- approved these changes

@0xc0170 0xc0170 0xc0170 approved these changes

Assignees
No one assigned
Labels
release-version: 5.9.5
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@paul-szczepanek-arm @0xc0170 @cmonr @mbed-ci @NirSonnenschein @pan-