Commit 65668776 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Add SMP flag for SC and set it when necessary. 



This patch adds a new SMP flag for tracking whether Secure Connections
is in use and sets the flag when both remote and local side have elected
to use Secure Connections.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 0edb14de

net/bluetooth/smp.c

+7 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ enum { 
	SMP_FLAG_MITM_AUTH,

	SMP_FLAG_COMPLETE,

	SMP_FLAG_INITIATOR,

	SMP_FLAG_SC,

};



struct smp_chan {
@@ -973,6 +974,9 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb) 


	build_pairing_cmd(conn, req, &rsp, auth);



	if (rsp.auth_req & SMP_AUTH_SC)

		set_bit(SMP_FLAG_SC, &smp->flags);



	key_size = min(req->max_key_size, rsp.max_key_size);

	if (check_enc_key_size(conn, key_size))

		return SMP_ENC_KEY_SIZE;
@@ -1020,6 +1024,9 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb) 


	auth = rsp->auth_req & AUTH_REQ_MASK(hdev);



	if ((req->auth_req & SMP_AUTH_SC) && (auth & SMP_AUTH_SC))

		set_bit(SMP_FLAG_SC, &smp->flags);



	/* If we need MITM check that it can be achieved */

	if (conn->hcon->pending_sec_level >= BT_SECURITY_HIGH) {

		u8 method;