From 449ce1bad9c52e0d86d68f6fda599dfac2811c1f Mon Sep 17 00:00:00 2001 From: Jiang Jiang Jian Date: Tue, 2 Jan 2018 16:15:39 +0800 Subject: [PATCH] Merge branch 'bugfix/btdm_aes_encrypt_workaround' into 'master' component/bt: disable Secure Connections to workaround AES encryption issue See merge request !1719 --- components/bt/bluedroid/include/bt_target.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/bt/bluedroid/include/bt_target.h b/components/bt/bluedroid/include/bt_target.h index fe39f8b9bd..da71657aef 100644 --- a/components/bt/bluedroid/include/bt_target.h +++ b/components/bt/bluedroid/include/bt_target.h @@ -647,7 +647,8 @@ /* 4.1/4.2 secure connections feature */ #ifndef SC_MODE_INCLUDED -#define SC_MODE_INCLUDED TRUE +// Disable AES-CCM (BT 4.1) for BT Classic to workaround controller AES issue. E0 encryption (BT 4.0) will be used. +#define SC_MODE_INCLUDED FALSE #endif /* Used for conformance testing ONLY */