ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use direct params not struct for pairing

pull/6188/head
paul-szczepanek-arm 2018-01-12 15:51:24 +00:00
parent af4bdc7562
commit 5474083469
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
features/FEATURE_BLE/ble/pal/PalSecurityManager.h
View File

@ -70,15 +70,6 @@ enum AuthenticationFlags_t : uint8_t {
AUTHENTICATION_KEYPRESS_NOTIFICATION = 0x10 AUTHENTICATION_KEYPRESS_NOTIFICATION = 0x10
}; };
struct pairing_request_t {
SecurityManager::SecurityIOCapabilities_t iocaps;
bool use_oob;
authentication_t auth;
uint8_t max_key_size;
key_distribution_t initiator_dist;
key_distribution_t responder_dist;
};
struct bonded_list_entry_t { struct bonded_list_entry_t {
address_t peer_address; address_t peer_address;
ediv_t ediv; ediv_t ediv;
@ -185,7 +176,13 @@ class SecurityManagerEventHandler {
_app_event_handler->confirmationRequest(handle); _app_event_handler->confirmationRequest(handle);
} }
} }
virtual void accept_pairing_request(connection_handle_t handle, pairing_request_t &params) { virtual void accept_pairing_request(connection_handle_t handle,
SecurityManager::SecurityIOCapabilities_t iocaps,
bool use_oob,
authentication_t authentication,
uint8_t max_key_size,
key_distribution_t initiator_dist,
key_distribution_t responder_dist) {
if (_app_event_handler) { if (_app_event_handler) {
_app_event_handler->acceptPairingRequest(handle); _app_event_handler->acceptPairingRequest(handle);
} }
@ -362,12 +359,36 @@ public:
/* authentication */ /* authentication */
virtual ble_error_t request_pairing(connection_handle_t handle, pairing_request_t &params) { virtual ble_error_t request_pairing(connection_handle_t handle,
SecurityManager::SecurityIOCapabilities_t iocaps,
bool use_oob,
authentication_t authentication,
uint8_t max_key_size,
key_distribution_t initiator_dist,
key_distribution_t responder_dist) {
(void)handle;
(void)iocaps;
(void)use_oob;
(void)authentication;
(void)max_key_size;
(void)initiator_dist;
(void)responder_dist;
return BLE_ERROR_NOT_IMPLEMENTED; return BLE_ERROR_NOT_IMPLEMENTED;
} }
virtual ble_error_t accept_pairing(connection_handle_t handle, pairing_request_t &params) { virtual ble_error_t accept_pairing(connection_handle_t handle,
SecurityManager::SecurityIOCapabilities_t iocaps,
bool use_oob,
authentication_t authentication,
uint8_t max_key_size,
key_distribution_t initiator_dist,
key_distribution_t responder_dist) {
(void)handle; (void)handle;
(void)params; (void)iocaps;
(void)use_oob;
(void)authentication;
(void)max_key_size;
(void)initiator_dist;
(void)responder_dist;
return BLE_ERROR_NOT_IMPLEMENTED; return BLE_ERROR_NOT_IMPLEMENTED;
} }
virtual ble_error_t reject_pairing(connection_handle_t handle) { virtual ble_error_t reject_pairing(connection_handle_t handle) {