michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Remove conn & SMP dependency from BLUETOOTH_TINYCRYPT_ECC

Browse source 
Ever since we expose ECDH as a more generic API that's not bound to
SMP we shouldn't be requiring selcting SMP in the configuration for it
to be available. Move it outside of the BLUETOOTH_SMP and
BLUETOOTH_CONN dependencies.

Change-Id: I4ac15ff92b1d4fcf3061a487718d364aa7d43bc8
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2016-07-22 09:54:12 +03:00
commit d43f4c27d0
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
net/bluetooth/Kconfig
View file

@ -208,17 +208,6 @@ config BLUETOOTH_SMP_SC_ONLY
Security Mode 1 Level 4 stands for authenticated LE Secure Connections Security Mode 1 Level 4 stands for authenticated LE Secure Connections
pairing with encryption. Enabling this option disables legacy pairing. pairing with encryption. Enabling this option disables legacy pairing.
config BLUETOOTH_TINYCRYPT_ECC
bool "Use TinyCrypt library for LE SC ECDH"
default n
select TINYCRYPT_ECC_DH
depends on MICROKERNEL
help
If this option is set TinyCrypt library is also used for LE Secure
Connections elliptic curve Diffie-Hellman key agreement. If not set
controller crypto is used for ECDH and if controller doesn't support
required HCI commands LE Secure Connections support will be disabled.
config BLUETOOTH_USE_DEBUG_KEYS config BLUETOOTH_USE_DEBUG_KEYS
bool "Enable Security Manager Debug Mode" bool "Enable Security Manager Debug Mode"
default n default n
@ -270,6 +259,18 @@ config BLUETOOTH_MAX_PAIRED
endif # BLUETOOTH_CONN endif # BLUETOOTH_CONN
config BLUETOOTH_TINYCRYPT_ECC
bool "Use TinyCrypt library for ECDH"
default n
select TINYCRYPT_ECC_DH
depends on MICROKERNEL
help
If this option is set TinyCrypt library is used for emulating the
ECDH HCI commands and events needed by e.g. LE Secure Connections.
If not set controller crypto is used for ECDH and if
controller doesn't support required HCI commands LE Secure
Connections support will be disabled.
endif # BLUETOOTH_LE endif # BLUETOOTH_LE
config BLUETOOTH_DEBUG config BLUETOOTH_DEBUG

3
net/bluetooth/Makefile
View file

@ -8,6 +8,8 @@ obj-$(CONFIG_BLUETOOTH_DEBUG) += log.o
obj-$(CONFIG_BLUETOOTH_DEBUG_MONITOR) += monitor.o obj-$(CONFIG_BLUETOOTH_DEBUG_MONITOR) += monitor.o
obj-$(CONFIG_BLUETOOTH_TINYCRYPT_ECC) += hci_ecc.o
ifeq ($(CONFIG_BLUETOOTH_CONN),y) ifeq ($(CONFIG_BLUETOOTH_CONN),y)
obj-y += conn.o \ obj-y += conn.o \
l2cap.o \ l2cap.o \
@ -21,6 +23,5 @@ ifeq ($(CONFIG_BLUETOOTH_CONN),y)
obj-y += smp_null.o obj-y += smp_null.o
endif endif
obj-$(CONFIG_BLUETOOTH_TINYCRYPT_ECC) += hci_ecc.o
obj-$(CONFIG_BLUETOOTH_BREDR) += keys.o l2cap_br.o obj-$(CONFIG_BLUETOOTH_BREDR) += keys.o l2cap_br.o
endif endif