diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2015-02-27 10:20:33 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2015-02-27 10:20:33 +0200 |
| commit | 6271215e3d077ceb0dad63ac60d09ccd51cadc07 (patch) | |
| tree | 2a7014a38377e2f2f57f6511c4bdd89ef039206f /android/bluetooth.c | |
| parent | 60ba9a54934ed2bd1cf60c858fc0defd2e4f725e (diff) | |
| download | bluez-6271215e3d077ceb0dad63ac60d09ccd51cadc07.tar.gz | |
mgmt: Update code to match updated New CSRK specification
The 'master' parameter was renamed to 'type' and now has two new
possible values.
Diffstat (limited to 'android/bluetooth.c')
| -rw-r--r-- | android/bluetooth.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android/bluetooth.c b/android/bluetooth.c index 45cac5f38..dbb68d430 100644 --- a/android/bluetooth.c +++ b/android/bluetooth.c @@ -2354,19 +2354,21 @@ static void new_csrk_callback(uint16_t index, uint16_t length, if (!dev) return; - switch (ev->key.master) { + switch (ev->key.type) { case 0x00: + case 0x02: memcpy(dev->local_csrk, ev->key.val, 16); dev->local_sign_cnt = 0; dev->valid_local_csrk = true; break; case 0x01: + case 0x03: memcpy(dev->remote_csrk, ev->key.val, 16); dev->remote_sign_cnt = 0; dev->valid_remote_csrk = true; break; default: - error("Unknown CSRK key type 02%02x", ev->key.master); + error("Unknown CSRK key type 02%02x", ev->key.type); return; } |