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

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

Bluetooth: Introduce requirements for security level 4 



The security level 4 is a new strong security requirement that is based
around 128-bit equivalent strength for link and encryption keys required
using FIPS approved algorithms. Which means that E0, SAFER+ and P-192
are not allowed. Only connections created with P-256 resulting from
using Secure Connections support are allowed.

This security level needs to be enforced when Secure Connection Only
mode is enabled for a controller or a service requires FIPS compliant
strong security. Currently it is not possible to enable either of
these two cases. This patch just puts in the foundation for being
able to handle security level 4 in the future.

It should be noted that devices or services with security level 4
requirement can only communicate using Bluetooth 4.1 controllers
with support for Secure Connections. There is no backward compatibilty
if used with older hardware.

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

include/net/bluetooth/bluetooth.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct bt_security { 
#define BT_SECURITY_LOW		1

#define BT_SECURITY_MEDIUM	2

#define BT_SECURITY_HIGH	3

#define BT_SECURITY_FIPS	4



#define BT_DEFER_SETUP	7

include/net/bluetooth/hci.h

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ enum { 
#define HCI_LM_TRUSTED	0x0008

#define HCI_LM_RELIABLE	0x0010

#define HCI_LM_SECURE	0x0020

#define HCI_LM_FIPS	0x0040



/* Authentication types */

#define HCI_AT_NO_BONDING		0x00

net/bluetooth/hci_conn.c

+13 −5
Original line number Diff line number Diff line
@@ -800,10 +800,17 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) 
	if (!(conn->link_mode & HCI_LM_AUTH))

		goto auth;



	/* An authenticated combination key has sufficient security for any

	   security level. */

	if (conn->key_type == HCI_LK_AUTH_COMBINATION_P192 ||

	    conn->key_type == HCI_LK_AUTH_COMBINATION_P256)

	/* An authenticated FIPS approved combination key has sufficient

	 * security for security level 4. */

	if (conn->key_type == HCI_LK_AUTH_COMBINATION_P256 &&

	    sec_level == BT_SECURITY_FIPS)

		goto encrypt;



	/* An authenticated combination key has sufficient security for

	   security level 3. */

	if ((conn->key_type == HCI_LK_AUTH_COMBINATION_P192 ||

	     conn->key_type == HCI_LK_AUTH_COMBINATION_P256) &&

	    sec_level == BT_SECURITY_HIGH)

		goto encrypt;



	/* An unauthenticated combination key has sufficient security for
@@ -818,7 +825,8 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type) 
	   is generated using maximum PIN code length (16).

	   For pre 2.1 units. */

	if (conn->key_type == HCI_LK_COMBINATION &&

	    (sec_level != BT_SECURITY_HIGH || conn->pin_length == 16))

	    (sec_level == BT_SECURITY_MEDIUM || sec_level == BT_SECURITY_LOW ||

	     conn->pin_length == 16))

		goto encrypt;



auth: