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.

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

BLE: fix pairing for misconfigured devices (deny pairing correctly) #7166

Merged
merged 1 commit into from Jun 13, 2018

Conversation

Projects
None yet
7 participants
@paul-szczepanek-arm
Member

paul-szczepanek-arm commented Jun 7, 2018

Description

Under certain circumstances when SC is not supported but required when pairing is requested this would send a reject (correctly) but also potentially accept at the same time because the function is missing a return that was intended to be there. The pairing would still fail but incorrect events and messages would be sent. This stops it.

Pull request type

[X] Fix
[ ] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change
missing return
function would potentially send a reject and accept at the same time

@paul-szczepanek-arm paul-szczepanek-arm requested a review from pan- Jun 7, 2018

@cmonr cmonr added the needs: review label Jun 7, 2018

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jun 10, 2018

Can you name this PR (fix the title, used in the release notes).

@paul-szczepanek-arm paul-szczepanek-arm changed the title from missing return to BLE: fix pairing for misconfigured devices (deny pairing correctly) Jun 11, 2018

@paul-szczepanek-arm

This comment has been minimized.

Member

paul-szczepanek-arm commented Jun 11, 2018

apologies, did mean to do that

@paul-szczepanek-arm paul-szczepanek-arm requested a review from donatieng Jun 11, 2018

@donatieng

Looks good!

@cmonr cmonr added needs: CI and removed needs: review labels Jun 12, 2018

@cmonr

cmonr approved these changes Jun 12, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Jun 12, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Jun 12, 2018

Build : SUCCESS

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

Triggering tests

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

@mbed-ci

This comment has been minimized.

@pan-

pan- approved these changes Jun 12, 2018

@mbed-ci

This comment has been minimized.

@0xc0170 0xc0170 added ready for merge and removed needs: CI labels Jun 13, 2018

@cmonr cmonr merged commit fff3564 into ARMmbed:master Jun 13, 2018

14 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-mbed2-build build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
travis-ci/astyle Passed, 920 files
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/events Passed, runtime is 9647 cycles (+818 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 9964B (+0.00%)
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment