Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / net / bluetooth / smp.c

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 983d1e0..3ebf65b 100644 (file)
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -964,7 +964,7 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)
        if (sec_level > conn->hcon->pending_sec_level)
                conn->hcon->pending_sec_level = sec_level;
 
-       /* If we need MITM check that it can be acheived */
+       /* If we need MITM check that it can be achieved */
        if (conn->hcon->pending_sec_level >= BT_SECURITY_HIGH) {
                u8 method;
 
@@ -1022,7 +1022,7 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)
 
        auth = rsp->auth_req & AUTH_REQ_MASK;
 
-       /* If we need MITM check that it can be acheived */
+       /* If we need MITM check that it can be achieved */
        if (conn->hcon->pending_sec_level >= BT_SECURITY_HIGH) {
                u8 method;
 
@@ -1743,123 +1743,3 @@ void smp_unregister(struct hci_dev *hdev)
        hdev->smp_data = NULL;
        l2cap_chan_put(chan);
 }
-
-#ifdef CONFIG_BT_SELFTEST
-
-static int __init test_ah(struct crypto_blkcipher *tfm_aes)
-{
-       u8 irk[16] = {  0x9b, 0x7d, 0x39, 0x0a, 0xa6, 0x10, 0x10, 0x34,
-                       0x05, 0xad, 0xc8, 0x57, 0xa3, 0x34, 0x02, 0xec };
-       u8 r[3] = {     0x94, 0x81, 0x70 };
-       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) != 0)
-               return -EINVAL;
-
-       return 0;
-}
-
-static int __init test_c1(struct crypto_blkcipher *tfm_aes)
-{
-       u8 k[16] = {    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-       u8 r[16] = {    0xe0, 0x2e, 0x70, 0xc6, 0x4e, 0x27, 0x88, 0x63,
-                       0x0e, 0x6f, 0xad, 0x56, 0x21, 0xd5, 0x83, 0x57 };
-       u8 preq[7] = {  0x01, 0x01, 0x00, 0x00, 0x10, 0x07, 0x07 };
-       u8 pres[7] = {  0x02, 0x03, 0x00, 0x00, 0x08, 0x00, 0x05 };
-       u8 _iat =       0x01;
-       u8 _rat =       0x00;
-       bdaddr_t ra = { { 0xb6, 0xb5, 0xb4, 0xb3, 0xb2, 0xb1 } };
-       bdaddr_t ia = { { 0xa6, 0xa5, 0xa4, 0xa3, 0xa2, 0xa1 } };
-       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) != 0)
-               return -EINVAL;
-
-       return 0;
-}
-
-static int __init test_s1(struct crypto_blkcipher *tfm_aes)
-{
-       u8 k[16] = {    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-       u8 r1[16] = {   0x88, 0x77, 0x66, 0x55, 0x44, 0x33, 0x22, 0x11 };
-       u8 r2[16] = {   0x00, 0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa, 0x99 };
-       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) != 0)
-               return -EINVAL;
-
-       return 0;
-}
-
-static int __init run_selftests(struct crypto_blkcipher *tfm_aes)
-{
-       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;
-       }
-
-       return 0;
-}
-
-static int __init test_smp(void)
-{
-       struct crypto_blkcipher *tfm_aes;
-       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);
-       }
-
-       err = run_selftests(tfm_aes);
-       if (err < 0)
-               BT_ERR("Self tests failed");
-       else
-               BT_INFO("Self-tests passed");
-
-       crypto_free_blkcipher(tfm_aes);
-
-       return err;
-}
-
-module_init(test_smp);
-
-#endif /* CONFIG_BT_SELFTEST */