From: Ville Tervo <ville.tervo@nokia.com>
To: ext Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Cc: linux-bluetooth@vger.kernel.org,
Anderson Briglia <anderson.briglia@openbossa.org>
Subject: Re: [bluetooth-next 10/24] Bluetooth: Implement the first SMP commands
Date: Thu, 10 Feb 2011 08:13:31 +0200 [thread overview]
Message-ID: <20110210061331.GJ874@null> (raw)
In-Reply-To: <1297300704-30006-11-git-send-email-vinicius.gomes@openbossa.org>
Hi,
On Wed, Feb 09, 2011 at 10:18:10PM -0300, ext Vinicius Costa Gomes wrote:
> From: Anderson Briglia <anderson.briglia@openbossa.org>
>
> These simple commands will allow the SMP procedure to be started
> and terminated with a not supported error. This is the first step
> toward something useful.
>
> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
> Signed-off-by: Anderson Briglia <anderson.briglia@openbossa.org>
> ---
> include/net/bluetooth/smp.h | 26 ++++++++
> net/bluetooth/Makefile | 2 +-
> net/bluetooth/smp.c | 144 +++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 171 insertions(+), 1 deletions(-)
> create mode 100644 net/bluetooth/smp.c
>
> diff --git a/include/net/bluetooth/smp.h b/include/net/bluetooth/smp.h
> index 8f2edbf..36bdd6e 100644
> --- a/include/net/bluetooth/smp.h
> +++ b/include/net/bluetooth/smp.h
> @@ -1,3 +1,25 @@
> +/*
> + BlueZ - Bluetooth protocol stack for Linux
> + Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License version 2 as
> + published by the Free Software Foundation;
> +
> + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
> + IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
> + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
> + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> +
> + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
> + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
> + SOFTWARE IS DISCLAIMED.
> +*/
> +
> #ifndef __SMP_H
> #define __SMP_H
>
> @@ -73,4 +95,8 @@ struct smp_cmd_security_req {
> #define SMP_UNSPECIFIED 0x08
> #define SMP_REPEATED_ATTEMPTS 0x09
>
> +/* SMP Commands */
> +int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level);
> +int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb);
> +
> #endif /* __SMP_H */
> diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
> index 339b429..cf6183c 100644
> --- a/net/bluetooth/Makefile
> +++ b/net/bluetooth/Makefile
> @@ -11,4 +11,4 @@ obj-$(CONFIG_BT_CMTP) += cmtp/
> obj-$(CONFIG_BT_HIDP) += hidp/
>
> bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o hci_sock.o hci_sysfs.o lib.o
> -l2cap-y := l2cap_core.o l2cap_sock.o
> +l2cap-y := l2cap_core.o l2cap_sock.o smp.o
> diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
> new file mode 100644
> index 0000000..c92c1f9
> --- /dev/null
> +++ b/net/bluetooth/smp.c
> @@ -0,0 +1,144 @@
> +/*
> + BlueZ - Bluetooth protocol stack for Linux
> + Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License version 2 as
> + published by the Free Software Foundation;
> +
> + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
> + IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
> + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
> + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> +
> + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
> + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
> + SOFTWARE IS DISCLAIMED.
> +*/
> +
> +#include <net/bluetooth/bluetooth.h>
> +#include <net/bluetooth/hci_core.h>
> +#include <net/bluetooth/l2cap.h>
> +#include <net/bluetooth/smp.h>
> +
> +static struct sk_buff *smp_build_cmd(struct l2cap_conn *conn, u8 code,
> + u16 dlen, void *data)
> +{
> + struct sk_buff *skb;
> + struct l2cap_hdr *lh;
> + int len;
> +
> + len = L2CAP_HDR_SIZE + 1 + dlen;
^^^
Use some #define for this. Or maybe sizeof(code)?
> +
> + if (len > conn->mtu)
> + return NULL;
> +
> + skb = bt_skb_alloc(len, GFP_ATOMIC);
> + if (!skb)
> + return NULL;
> +
> + lh = (struct l2cap_hdr *) skb_put(skb, L2CAP_HDR_SIZE);
> + lh->len = cpu_to_le16(1 + dlen);
Ditto
> + lh->cid = cpu_to_le16(L2CAP_CID_SMP);
> +
> + memcpy(skb_put(skb, 1), &code, 1);
Ditto
> +
> + memcpy(skb_put(skb, dlen), data, dlen);
> +
> + return skb;
> +}
> +
> +static void smp_send_cmd(struct l2cap_conn *conn, u8 code, u16 len, void *data)
> +{
> + struct sk_buff *skb = smp_build_cmd(conn, code, len, data);
> +
> + BT_DBG("code 0x%2.2x", code);
> +
> + if (!skb)
> + return;
> +
> + hci_send_acl(conn->hcon, skb, 0);
> +}
> +
> +int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level)
> +{
> + __u8 authreq;
> +
> + BT_DBG("conn %p hcon %p level 0x%2.2x", conn, conn->hcon, sec_level);
> +
> + switch (sec_level) {
> + case BT_SECURITY_MEDIUM:
> + /* Encrypted, no MITM protection */
> + authreq = HCI_AT_NO_BONDING_MITM;
> + break;
> +
> + case BT_SECURITY_HIGH:
> + /* Bonding, MITM protection */
> + authreq = HCI_AT_GENERAL_BONDING_MITM;
> + break;
> +
> + case BT_SECURITY_LOW:
> + default:
> + return 1;
> + }
> +
> + if (conn->hcon->link_mode & HCI_LM_MASTER) {
> + struct smp_cmd_pairing cp;
> + cp.io_capability = 0x00;
> + cp.oob_flag = 0x00;
> + cp.max_key_size = 16;
> + cp.init_key_dist = 0x00;
> + cp.resp_key_dist = 0x00;
> + cp.auth_req = authreq;
> + smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &cp);
> + } else {
> + struct smp_cmd_security_req cp;
> + cp.auth_req = authreq;
> + smp_send_cmd(conn, SMP_CMD_SECURITY_REQ, sizeof(cp), &cp);
> + }
> +
> + return 0;
> +}
> +
> +int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb)
> +{
> + __u8 code = skb->data[0];
> + __u8 reason;
> + int err = 0;
> +
> + skb_pull(skb, 1);
> +
Ditto
> + switch (code) {
> + case SMP_CMD_PAIRING_REQ:
> + reason = SMP_PAIRING_NOTSUPP;
> + smp_send_cmd(conn, SMP_CMD_PAIRING_FAIL, 1, &reason);
> + err = -EOPNOTSUPP;
> + break;
> +
> + case SMP_CMD_PAIRING_FAIL:
> + break;
> +
> + case SMP_CMD_PAIRING_RSP:
> + case SMP_CMD_PAIRING_CONFIRM:
> + case SMP_CMD_PAIRING_RANDOM:
> + case SMP_CMD_ENCRYPT_INFO:
> + case SMP_CMD_MASTER_IDENT:
> + case SMP_CMD_IDENT_INFO:
> + case SMP_CMD_IDENT_ADDR_INFO:
> + case SMP_CMD_SIGN_INFO:
> + case SMP_CMD_SECURITY_REQ:
> + default:
> + BT_DBG("Unknown command code 0x%2.2x", code);
> +
> + reason = SMP_CMD_NOTSUPP;
> + smp_send_cmd(conn, SMP_CMD_PAIRING_FAIL, 1, &reason);
Ditto
> + err = -EOPNOTSUPP;
> + }
> +
> + kfree_skb(skb);
> + return err;
> +}
> --
> 1.7.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2011-02-10 6:13 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-10 1:18 [bluetooth-next 00/24] Just Works SMP implementation Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 01/24] Bluetooth: Add low energy commands and events Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 02/24] Bluetooth: Add LE connect support Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 03/24] Bluetooth: Use LE buffers for LE traffic Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 04/24] Bluetooth: Add LE connection support to L2CAP Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 05/24] Bluetooth: Add server socket support for LE connection Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 06/24] Bluetooth: Do not send disconn comand over LE links Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 07/24] Bluetooth: Fix initiated LE connections Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 08/24] Bluetooth: Treat LE and ACL links separately on timeout Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 09/24] Bluetooth: Add SMP command structures Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 10/24] Bluetooth: Implement the first SMP commands Vinicius Costa Gomes
2011-02-10 6:13 ` Ville Tervo [this message]
2011-02-10 1:18 ` [bluetooth-next 11/24] Bluetooth: Start SMP procedure Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 12/24] Bluetooth: simple SMP pairing negotiation Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 13/24] Bluetooth: LE SMP Cryptoolbox functions Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 14/24] Bluetooth: Add support for using the crypto subsystem Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 15/24] Bluetooth: Add SMP confirmation structs Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 16/24] Bluetooth: Add SMP confirmation checks methods Vinicius Costa Gomes
2011-02-10 6:37 ` Ville Tervo
2011-02-10 1:18 ` [bluetooth-next 17/24] Bluetooth: Minor fix in SMP methods Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 18/24] Bluetooth: Add support for LE Start Encryption Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 19/24] Bluetooth: Add support for resuming socket when SMP is finished Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 20/24] Bluetooth: Fix initial security level of LE links Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 21/24] Bluetooth: Update the security level when link is encrypted Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 22/24] Bluetooth: Add support for Pairing features exchange Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 23/24] Bluetooth: Add support for SMP timeout Vinicius Costa Gomes
2011-02-10 1:18 ` [bluetooth-next 24/24] Bluetooth: Add key size checks for SMP Vinicius Costa Gomes
2011-02-10 6:57 ` [bluetooth-next 00/24] Just Works SMP implementation Ville Tervo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110210061331.GJ874@null \
--to=ville.tervo@nokia.com \
--cc=anderson.briglia@openbossa.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=vinicius.gomes@openbossa.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.