Bluetooth: Update New CSRK event to match latest specification

The 'master' parameter of the New CSRK event was recently renamed to
'type', with the old values kept for backwards compatibility as
unauthenticated local/remote keys. This patch updates the code to take
into account the two new (authenticated) values and ensures they get
used based on the security level of the connection that the respective
keys get distributed over.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 8 insertions, 2 deletions

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index b2803bd6e0d8..c91c19bfc0a8 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -1252,7 +1252,10 @@ static void smp_distribute_keys(struct smp_chan *smp)
 
                 csrk = kzalloc(sizeof(*csrk), GFP_KERNEL);
                 if (csrk) {
-                        csrk->master = 0x00;
+                        if (hcon->sec_level > BT_SECURITY_MEDIUM)
+                                csrk->type = MGMT_CSRK_LOCAL_AUTHENTICATED;
+                        else
+                                csrk->type = MGMT_CSRK_LOCAL_UNAUTHENTICATED;
                         memcpy(csrk->val, sign.csrk, sizeof(csrk->val));
                 }
                 smp->slave_csrk = csrk;
@@ -2352,7 +2355,10 @@ static int smp_cmd_sign_info(struct l2cap_conn *conn, struct sk_buff *skb)
 
         csrk = kzalloc(sizeof(*csrk), GFP_KERNEL);
         if (csrk) {
-                csrk->master = 0x01;
+                if (conn->hcon->sec_level > BT_SECURITY_MEDIUM)
+                        csrk->type = MGMT_CSRK_REMOTE_AUTHENTICATED;
+                else
+                        csrk->type = MGMT_CSRK_REMOTE_UNAUTHENTICATED;
                 memcpy(csrk->val, rp->csrk, sizeof(csrk->val));
         }
         smp->csrk = csrk;