Bluetooth: Add SMP self-tests (try number 4)
Subsystems (2)
cover Bluetooth: Add SMP self-tests (try number 4)
Hi,
Now that we went with Marcel's RFC approach, here's an updated set of the SMP tests reworked to match the new design.
Johan
----------------------------------------------------------------
Johan Hedberg (3):
Bluetooth: Add skeleton for SMP self-tests
Bluetooth: Add legacy SMP tests
Bluetooth: Add LE Secure Connections tests for SMP
net/bluetooth/Kconfig | 7 + net/bluetooth/selftest.c | 7 + net/bluetooth/smp.c | 320 +++++++++++++++++++++++++++++++++++++++++++++ net/bluetooth/smp.h | 13 ++ 4 files changed, 347 insertions(+)
PATCH 1/3 Bluetooth: Add skeleton for SMP self-tests
From: Johan Hedberg <[email protected]>
This patch adds the initial skeleton and kernel config option for SMP self-tests.
--- net/bluetooth/Kconfig | 7 +++++++ net/bluetooth/selftest.c | 7 +++++++ net/bluetooth/smp.c | 39 +++++++++++++++++++++++++++++++++++++++ net/bluetooth/smp.h | 13 +++++++++++++ 4 files changed, 66 insertions(+)
net/bluetooth/Kconfig +7 -0
@@ -84,4 +84,11 @@ config BT_SELFTEST_ECDH Run test cases for ECDH cryptographic functionality used by the Bluetooth Low Energy Secure Connections feature. +config BT_SELFTEST_SMP + bool "SMP test cases" + depends on BT_LE && BT_SELFTEST + help + Run test cases for SMP cryptographic functionality, including both + legacy SMP as well as the Secure Connections features. + source "drivers/bluetooth/Kconfig"
net/bluetooth/selftest.c +7 -0
@@ -22,8 +22,10 @@*/ #include <net/bluetooth/bluetooth.h> +#include <net/bluetooth/hci_core.h> #include "ecc.h" +#include "smp.h" #include "selftest.h" #if IS_ENABLED (CONFIG_BT_SELFTEST_ECDH )
@@ -195,7 +197,12 @@ static int __init run_selftest(void)BT_INFO ("Starting self testing" ); err =test_ecdh (); +if (err) + goto done; + err =bt_selftest_smp (); + +done:BT_INFO ("Finished self testing" );return err;
net/bluetooth/smp.c +39 -0
@@ -3022,3 +3022,42 @@ void smp_unregister(struct hci_dev *hdev)smp_del_chan (chan); } } + +#if IS_ENABLED (CONFIG_BT_SELFTEST_SMP ) + +static int __init run_selftests (struct crypto_blkcipher *tfm_aes, +struct crypto_hash *tfm_cmac) +{ +BT_INFO ("SMP test passed" ); + +return 0 ; +} + +int __init bt_selftest_smp (void ) +{ +struct crypto_blkcipher *tfm_aes; +struct crypto_hash *tfm_cmac; +int err; + + tfm_aes =crypto_alloc_blkcipher ("ecb(aes)" ,0 ,CRYPTO_ALG_ASYNC ); +if (IS_ERR (tfm_aes)) { +BT_ERR ("Unable to create ECB crypto context" ); +return PTR_ERR (tfm_aes); + } + + tfm_cmac =crypto_alloc_hash ("cmac(aes)" ,0 ,CRYPTO_ALG_ASYNC ); +if (IS_ERR (tfm_cmac)) { +BT_ERR ("Unable to create CMAC crypto context" ); +crypto_free_blkcipher (tfm_aes); +return PTR_ERR (tfm_cmac); + } + + err =run_selftests (tfm_aes, tfm_cmac); + +crypto_free_hash (tfm_cmac); +crypto_free_blkcipher (tfm_aes); + +return err; +} + +#endif
net/bluetooth/smp.h +13 -0
@@ -192,4 +192,17 @@ int smp_generate_rpa(struct hci_dev *hdev, const u8 irk[16], bdaddr_t *rpa);int smp_register (struct hci_dev *hdev);void smp_unregister (struct hci_dev *hdev); +#if IS_ENABLED (CONFIG_BT_SELFTEST_SMP ) + +int bt_selftest_smp (void ); + +#else + +static inline int bt_selftest_smp (void ) +{ +return 0 ; +} + +#endif +#endif /* __SMP_H */
Signature · 1 line
2.1.0
PATCH 2/3 Bluetooth: Add legacy SMP tests
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch adds self-tests for legacy SMP crypto functions. The sample data has been taken from the core specification.
--- net/bluetooth/smp.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+)
net/bluetooth/smp.c +95 -0
@@ -3025,9 +3025,104 @@ void smp_unregister(struct hci_dev *hdev)#if IS_ENABLED (CONFIG_BT_SELFTEST_SMP ) +static int __init test_ah (struct crypto_blkcipher *tfm_aes) +{ +const u8 irk[16 ] = { +0x9b ,0x7d ,0x39 ,0x0a ,0xa6 ,0x10 ,0x10 ,0x34 , +0x05 ,0xad ,0xc8 ,0x57 ,0xa3 ,0x34 ,0x02 ,0xec }; +const u8 r[3 ] = {0x94 ,0x81 ,0x70 }; +const u8 exp[3 ] = {0xaa ,0xfb ,0x0d }; +u8 res[3 ]; +int err; + + err =smp_ah (tfm_aes, irk, r, res); +if (err) +return err; + +if (memcmp (res, exp,3 )) +return -EINVAL ; + +return 0 ; +} + +static int __init test_c1 (struct crypto_blkcipher *tfm_aes) +{ +const u8 k[16 ] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +const u8 r[16 ] = { +0xe0 ,0x2e ,0x70 ,0xc6 ,0x4e ,0x27 ,0x88 ,0x63 , +0x0e ,0x6f ,0xad ,0x56 ,0x21 ,0xd5 ,0x83 ,0x57 }; +const u8 preq[7 ] = {0x01 ,0x01 ,0x00 ,0x00 ,0x10 ,0x07 ,0x07 }; +const u8 pres[7 ] = {0x02 ,0x03 ,0x00 ,0x00 ,0x08 ,0x00 ,0x05 }; +const u8 _iat =0x01 ; +const u8 _rat =0x00 ; +const bdaddr_t ra = { {0xb6 ,0xb5 ,0xb4 ,0xb3 ,0xb2 ,0xb1 } }; +const bdaddr_t ia = { {0xa6 ,0xa5 ,0xa4 ,0xa3 ,0xa2 ,0xa1 } }; +const u8 exp[16 ] = { +0x86 ,0x3b ,0xf1 ,0xbe ,0xc5 ,0x4d ,0xa7 ,0xd2 , +0xea ,0x88 ,0x89 ,0x87 ,0xef ,0x3f ,0x1e ,0x1e }; +u8 res[16 ]; +int err; + + err =smp_c1 (tfm_aes, k, r, preq, pres, _iat, &ia, _rat, &ra, res); +if (err) +return err; + +if (memcmp (res, exp,16 )) +return -EINVAL ; + +return 0 ; +} + +static int __init test_s1 (struct crypto_blkcipher *tfm_aes) +{ +const u8 k[16 ] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 }; +const u8 r1[16 ] = { +0x88 ,0x77 ,0x66 ,0x55 ,0x44 ,0x33 ,0x22 ,0x11 }; +const u8 r2[16 ] = { +0x00 ,0xff ,0xee ,0xdd ,0xcc ,0xbb ,0xaa ,0x99 }; +const u8 exp[16 ] = { +0x62 ,0xa0 ,0x6d ,0x79 ,0xae ,0x16 ,0x42 ,0x5b , +0x9b ,0xf4 ,0xb0 ,0xe8 ,0xf0 ,0xe1 ,0x1f ,0x9a }; +u8 res[16 ]; +int err; + + err =smp_s1 (tfm_aes, k, r1, r2, res); +if (err) +return err; + +if (memcmp (res, exp,16 )) +return -EINVAL ; + +return 0 ; +} +static int __init run_selftests (struct crypto_blkcipher *tfm_aes,struct crypto_hash *tfm_cmac) { +int err; + + err =test_ah (tfm_aes); +if (err) { +BT_ERR ("smp_ah test failed" ); +return err; + } + + err =test_c1 (tfm_aes); +if (err) { +BT_ERR ("smp_c1 test failed" ); +return err; + } + + err =test_s1 (tfm_aes); +if (err) { +BT_ERR ("smp_s1 test failed" ); +return err; + } +BT_INFO ("SMP test passed" );return 0 ;
Signature · 1 line
2.1.0
PATCH 3/3 Bluetooth: Add LE Secure Connections tests for SMP
In reply to Johan HedbergFrom: Johan Hedberg <[email protected]>
This patch adds SMP self-tests for the Secure Connections crypto functions. The sample data has been taken from the core specification.
--- net/bluetooth/smp.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+)
net/bluetooth/smp.c +186 -0
@@ -3100,6 +3100,162 @@ static int __init test_s1(struct crypto_blkcipher *tfm_aes)return 0 ; } +static int __init test_f4 (struct crypto_hash *tfm_cmac) +{ +const u8 u[32 ] = { +0xe6 ,0x9d ,0x35 ,0x0e ,0x48 ,0x01 ,0x03 ,0xcc , +0xdb ,0xfd ,0xf4 ,0xac ,0x11 ,0x91 ,0xf4 ,0xef , +0xb9 ,0xa5 ,0xf9 ,0xe9 ,0xa7 ,0x83 ,0x2c ,0x5e , +0x2c ,0xbe ,0x97 ,0xf2 ,0xd2 ,0x03 ,0xb0 ,0x20 }; +const u8 v[32 ] = { +0xfd ,0xc5 ,0x7f ,0xf4 ,0x49 ,0xdd ,0x4f ,0x6b , +0xfb ,0x7c ,0x9d ,0xf1 ,0xc2 ,0x9a ,0xcb ,0x59 , +0x2a ,0xe7 ,0xd4 ,0xee ,0xfb ,0xfc ,0x0a ,0x90 , +0x9a ,0xbb ,0xf6 ,0x32 ,0x3d ,0x8b ,0x18 ,0x55 }; +const u8 x[16 ] = { +0xab ,0xae ,0x2b ,0x71 ,0xec ,0xb2 ,0xff ,0xff , +0x3e ,0x73 ,0x77 ,0xd1 ,0x54 ,0x84 ,0xcb ,0xd5 }; +const u8 z =0x00 ; +const u8 exp[16 ] = { +0x2d ,0x87 ,0x74 ,0xa9 ,0xbe ,0xa1 ,0xed ,0xf1 , +0x1c ,0xbd ,0xa9 ,0x07 ,0xf1 ,0x16 ,0xc9 ,0xf2 }; +u8 res[16 ]; +int err; + + err =smp_f4 (tfm_cmac, u, v, x, z, res); +if (err) +return err; + +if (memcmp (res, exp,16 )) +return -EINVAL ; + +return 0 ; +} + +static int __init test_f5 (struct crypto_hash *tfm_cmac) +{ +const u8 w[32 ] = { +0x98 ,0xa6 ,0xbf ,0x73 ,0xf3 ,0x34 ,0x8d ,0x86 , +0xf1 ,0x66 ,0xf8 ,0xb4 ,0x13 ,0x6b ,0x79 ,0x99 , +0x9b ,0x7d ,0x39 ,0x0a ,0xa6 ,0x10 ,0x10 ,0x34 , +0x05 ,0xad ,0xc8 ,0x57 ,0xa3 ,0x34 ,0x02 ,0xec }; +const u8 n1[16 ] = { +0xab ,0xae ,0x2b ,0x71 ,0xec ,0xb2 ,0xff ,0xff , +0x3e ,0x73 ,0x77 ,0xd1 ,0x54 ,0x84 ,0xcb ,0xd5 }; +const u8 n2[16 ] = { +0xcf ,0xc4 ,0x3d ,0xff ,0xf7 ,0x83 ,0x65 ,0x21 , +0x6e ,0x5f ,0xa7 ,0x25 ,0xcc ,0xe7 ,0xe8 ,0xa6 }; +const u8 a1[7 ] = {0xce ,0xbf ,0x37 ,0x37 ,0x12 ,0x56 ,0x00 }; +const u8 a2[7 ] = {0xc1 ,0xcf ,0x2d ,0x70 ,0x13 ,0xa7 ,0x00 }; +const u8 exp_ltk[16 ] = { +0x38 ,0x0a ,0x75 ,0x94 ,0xb5 ,0x22 ,0x05 ,0x98 , +0x23 ,0xcd ,0xd7 ,0x69 ,0x11 ,0x79 ,0x86 ,0x69 }; +const u8 exp_mackey[16 ] = { +0x20 ,0x6e ,0x63 ,0xce ,0x20 ,0x6a ,0x3f ,0xfd , +0x02 ,0x4a ,0x08 ,0xa1 ,0x76 ,0xf1 ,0x65 ,0x29 }; +u8 mackey[16 ], ltk[16 ]; +int err; + + err =smp_f5 (tfm_cmac, w, n1, n2, a1, a2, mackey, ltk); +if (err) +return err; + +if (memcmp (mackey, exp_mackey,16 )) +return -EINVAL ; + +if (memcmp (ltk, exp_ltk,16 )) +return -EINVAL ; + +return 0 ; +} + +static int __init test_f6 (struct crypto_hash *tfm_cmac) +{ +const u8 w[16 ] = { +0x20 ,0x6e ,0x63 ,0xce ,0x20 ,0x6a ,0x3f ,0xfd , +0x02 ,0x4a ,0x08 ,0xa1 ,0x76 ,0xf1 ,0x65 ,0x29 }; +const u8 n1[16 ] = { +0xab ,0xae ,0x2b ,0x71 ,0xec ,0xb2 ,0xff ,0xff , +0x3e ,0x73 ,0x77 ,0xd1 ,0x54 ,0x84 ,0xcb ,0xd5 }; +const u8 n2[16 ] = { +0xcf ,0xc4 ,0x3d ,0xff ,0xf7 ,0x83 ,0x65 ,0x21 , +0x6e ,0x5f ,0xa7 ,0x25 ,0xcc ,0xe7 ,0xe8 ,0xa6 }; +const u8 r[16 ] = { +0xc8 ,0x0f ,0x2d ,0x0c ,0xd2 ,0x42 ,0xda ,0x08 , +0x54 ,0xbb ,0x53 ,0xb4 ,0x3b ,0x34 ,0xa3 ,0x12 }; +const u8 io_cap[3 ] = {0x02 ,0x01 ,0x01 }; +const u8 a1[7 ] = {0xce ,0xbf ,0x37 ,0x37 ,0x12 ,0x56 ,0x00 }; +const u8 a2[7 ] = {0xc1 ,0xcf ,0x2d ,0x70 ,0x13 ,0xa7 ,0x00 }; +const u8 exp[16 ] = { +0x61 ,0x8f ,0x95 ,0xda ,0x09 ,0x0b ,0x6c ,0xd2 , +0xc5 ,0xe8 ,0xd0 ,0x9c ,0x98 ,0x73 ,0xc4 ,0xe3 }; +u8 res[16 ]; +int err; + + err =smp_f6 (tfm_cmac, w, n1, n2, r, io_cap, a1, a2, res); +if (err) +return err; + +if (memcmp (res, exp,16 )) +return -EINVAL ; + +return 0 ; +} + +static int __init test_g2 (struct crypto_hash *tfm_cmac) +{ +const u8 u[32 ] = { +0xe6 ,0x9d ,0x35 ,0x0e ,0x48 ,0x01 ,0x03 ,0xcc , +0xdb ,0xfd ,0xf4 ,0xac ,0x11 ,0x91 ,0xf4 ,0xef , +0xb9 ,0xa5 ,0xf9 ,0xe9 ,0xa7 ,0x83 ,0x2c ,0x5e , +0x2c ,0xbe ,0x97 ,0xf2 ,0xd2 ,0x03 ,0xb0 ,0x20 }; +const u8 v[32 ] = { +0xfd ,0xc5 ,0x7f ,0xf4 ,0x49 ,0xdd ,0x4f ,0x6b , +0xfb ,0x7c ,0x9d ,0xf1 ,0xc2 ,0x9a ,0xcb ,0x59 , +0x2a ,0xe7 ,0xd4 ,0xee ,0xfb ,0xfc ,0x0a ,0x90 , +0x9a ,0xbb ,0xf6 ,0x32 ,0x3d ,0x8b ,0x18 ,0x55 }; +const u8 x[16 ] = { +0xab ,0xae ,0x2b ,0x71 ,0xec ,0xb2 ,0xff ,0xff , +0x3e ,0x73 ,0x77 ,0xd1 ,0x54 ,0x84 ,0xcb ,0xd5 }; +const u8 y[16 ] = { +0xcf ,0xc4 ,0x3d ,0xff ,0xf7 ,0x83 ,0x65 ,0x21 , +0x6e ,0x5f ,0xa7 ,0x25 ,0xcc ,0xe7 ,0xe8 ,0xa6 }; +const u32 exp_val =0x2f9ed5ba %1000000 ; +u32 val; +int err; + + err =smp_g2 (tfm_cmac, u, v, x, y, &val); +if (err) +return err; + +if (val != exp_val) +return -EINVAL ; + +return 0 ; +} + +static int __init test_h6 (struct crypto_hash *tfm_cmac) +{ +const u8 w[16 ] = { +0x9b ,0x7d ,0x39 ,0x0a ,0xa6 ,0x10 ,0x10 ,0x34 , +0x05 ,0xad ,0xc8 ,0x57 ,0xa3 ,0x34 ,0x02 ,0xec }; +const u8 key_id[4 ] = {0x72 ,0x62 ,0x65 ,0x6c }; +const u8 exp[16 ] = { +0x99 ,0x63 ,0xb1 ,0x80 ,0xe2 ,0xa9 ,0xd3 ,0xe8 , +0x1c ,0xc9 ,0x6d ,0xe7 ,0x02 ,0xe1 ,0x9a ,0x2d }; +u8 res[16 ]; +int err; + + err =smp_h6 (tfm_cmac, w, key_id, res); +if (err) +return err; + +if (memcmp (res, exp,16 )) +return -EINVAL ; + +return 0 ; +} +static int __init run_selftests (struct crypto_blkcipher *tfm_aes,struct crypto_hash *tfm_cmac) {
@@ -3123,6 +3279,36 @@ static int __init run_selftests(struct crypto_blkcipher *tfm_aes,return err; } + err =test_f4 (tfm_cmac); +if (err) { +BT_ERR ("smp_f4 test failed" ); +return err; + } + + err =test_f5 (tfm_cmac); +if (err) { +BT_ERR ("smp_f5 test failed" ); +return err; + } + + err =test_f6 (tfm_cmac); +if (err) { +BT_ERR ("smp_f6 test failed" ); +return err; + } + + err =test_g2 (tfm_cmac); +if (err) { +BT_ERR ("smp_g2 test failed" ); +return err; + } + + err =test_h6 (tfm_cmac); +if (err) { +BT_ERR ("smp_h6 test failed" ); +return err; + } +BT_INFO ("SMP test passed" );return 0 ;
Signature · 1 line
2.1.0
Marcel Holtmann
maintainerHi Johan,
Quoted 11 lines
Now that we went with Marcel's RFC approach, here's an updated set of the SMP tests reworked to match the new design.
Johan
----------------------------------------------------------------
Johan Hedberg (3):
Bluetooth: Add skeleton for SMP self-tests
Bluetooth: Add legacy SMP tests
Bluetooth: Add LE Secure Connections tests for SMP
Quoted 5 lines
net/bluetooth/Kconfig | 7 + net/bluetooth/selftest.c | 7 + net/bluetooth/smp.c | 320 +++++++++++++++++++++++++++++++++++++++++++++ net/bluetooth/smp.h | 13 ++ 4 files changed, 347 insertions(+)
all 3 patches have been applied to bluetooth-next tree.
Regards
Marcel