Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Bluetooth: Make SMP context private to smp.c 



There are no users of the smp_chan struct outside of smp.c so move it
away from smp.h. The addition of the l2cap.h include to hci_core.c,
hci_conn.c and mgmt.c is something that should have been there already
previously to avoid warnings of undeclared struct l2cap_conn, but the
compiler warning was apparently shadowed away by the mention of
l2cap_conn in the struct smp_chan definition.

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

net/bluetooth/hci_conn.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>

#include <net/bluetooth/l2cap.h>



#include "smp.h"

#include "a2mp.h"

net/bluetooth/hci_core.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>

#include <net/bluetooth/l2cap.h>



#include "smp.h"

net/bluetooth/mgmt.c

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>

#include <net/bluetooth/l2cap.h>

#include <net/bluetooth/mgmt.h>



#include "smp.h"

net/bluetooth/smp.c

+29 −0
Original line number Diff line number Diff line
@@ -35,6 +35,35 @@ 


#define AUTH_REQ_MASK   0x07



#define SMP_FLAG_TK_VALID	1

#define SMP_FLAG_CFM_PENDING	2

#define SMP_FLAG_MITM_AUTH	3

#define SMP_FLAG_COMPLETE	4

#define SMP_FLAG_INITIATOR	5



struct smp_chan {

	struct l2cap_conn *conn;

	u8		preq[7]; /* SMP Pairing Request */

	u8		prsp[7]; /* SMP Pairing Response */

	u8		prnd[16]; /* SMP Pairing Random (local) */

	u8		rrnd[16]; /* SMP Pairing Random (remote) */

	u8		pcnf[16]; /* SMP Pairing Confirm */

	u8		tk[16]; /* SMP Temporary Key */

	u8		enc_key_size;

	u8		remote_key_dist;

	bdaddr_t	id_addr;

	u8		id_addr_type;

	u8		irk[16];

	struct smp_csrk	*csrk;

	struct smp_csrk	*slave_csrk;

	struct smp_ltk	*ltk;

	struct smp_ltk	*slave_ltk;

	struct smp_irk	*remote_irk;

	unsigned long	smp_flags;

	struct work_struct confirm;

	struct work_struct random;

};



static inline void swap128(const u8 src[16], u8 dst[16])

{

	int i;

net/bluetooth/smp.h

+0 −29
Original line number Diff line number Diff line
@@ -116,35 +116,6 @@ struct smp_cmd_security_req { 
#define SMP_MIN_ENC_KEY_SIZE		7

#define SMP_MAX_ENC_KEY_SIZE		16



#define SMP_FLAG_TK_VALID	1

#define SMP_FLAG_CFM_PENDING	2

#define SMP_FLAG_MITM_AUTH	3

#define SMP_FLAG_COMPLETE	4

#define SMP_FLAG_INITIATOR	5



struct smp_chan {

	struct l2cap_conn *conn;

	u8		preq[7]; /* SMP Pairing Request */

	u8		prsp[7]; /* SMP Pairing Response */

	u8		prnd[16]; /* SMP Pairing Random (local) */

	u8		rrnd[16]; /* SMP Pairing Random (remote) */

	u8		pcnf[16]; /* SMP Pairing Confirm */

	u8		tk[16]; /* SMP Temporary Key */

	u8		enc_key_size;

	u8		remote_key_dist;

	bdaddr_t	id_addr;

	u8		id_addr_type;

	u8		irk[16];

	struct smp_csrk	*csrk;

	struct smp_csrk	*slave_csrk;

	struct smp_ltk	*ltk;

	struct smp_ltk	*slave_ltk;

	struct smp_irk	*remote_irk;

	unsigned long	smp_flags;

	struct work_struct confirm;

	struct work_struct random;

};



/* SMP Commands */

bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level);

int smp_conn_security(struct hci_conn *hcon, __u8 sec_level);