diff --git a/packages/linux/patches/raspberrypi/linux-999.99-revert-faulty-bt-encryption-commit.patch b/packages/linux/patches/raspberrypi/linux-999.99-revert-faulty-bt-encryption-commit.patch new file mode 100644 index 0000000000..43bdf5e60f --- /dev/null +++ b/packages/linux/patches/raspberrypi/linux-999.99-revert-faulty-bt-encryption-commit.patch @@ -0,0 +1,48 @@ +From aa843e35a472a2aff26250662d21ff30629d294c Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Wed, 5 Jun 2019 16:35:18 +0100 +Subject: [PATCH] Revert "Bluetooth: Align minimum encryption key size for LE + and BR/EDR connections" + +This reverts commit 07e38998a19d72b916c39a983c19134522ae806b. +--- + include/net/bluetooth/hci_core.h | 3 --- + net/bluetooth/hci_conn.c | 8 -------- + 2 files changed, 11 deletions(-) + +diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h +index 05b1b96..094e61e 100644 +--- a/include/net/bluetooth/hci_core.h ++++ b/include/net/bluetooth/hci_core.h +@@ -190,9 +190,6 @@ struct adv_info { + + #define HCI_MAX_SHORT_NAME_LENGTH 10 + +-/* Min encryption key size to match with SMP */ +-#define HCI_MIN_ENC_KEY_SIZE 7 +- + /* Default LE RPA expiry time, 15 minutes */ + #define HCI_DEFAULT_RPA_TIMEOUT (15 * 60) + +diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c +index 3cf0764..bd4978c 100644 +--- a/net/bluetooth/hci_conn.c ++++ b/net/bluetooth/hci_conn.c +@@ -1276,14 +1276,6 @@ int hci_conn_check_link_mode(struct hci_conn *conn) + !test_bit(HCI_CONN_ENCRYPT, &conn->flags)) + return 0; + +- /* The minimum encryption key size needs to be enforced by the +- * host stack before establishing any L2CAP connections. The +- * specification in theory allows a minimum of 1, but to align +- * BR/EDR and LE transports, a minimum of 7 is chosen. +- */ +- if (conn->enc_key_size < HCI_MIN_ENC_KEY_SIZE) +- return 0; +- + return 1; + } + +-- +2.14.1 +