diff options
author | Anderson Briglia <anderson.briglia@openbossa.org> | 2011-06-09 17:50:45 -0400 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-13 14:48:24 -0400 |
commit | f01ead315785768cdb6e928646f90a47640bcdd9 (patch) | |
tree | f080c5a9c0b18d6638ed52fad4c3e9c947a2c4a4 /net/bluetooth | |
parent | d22ef0bc83c5a4e7ca9f2791e658dc8949d31ff4 (diff) |
Bluetooth: Add SMP confirmation structs
This patch adds initial support for verifying the confirmation value
that the remote side has sent.
Signed-off-by: Anderson Briglia <anderson.briglia@openbossa.org>
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/smp.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 57fc7d0cadf3..fa22f4aa3b04 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c | |||
@@ -187,6 +187,8 @@ static void smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb) | |||
187 | 187 | ||
188 | BT_DBG("conn %p", conn); | 188 | BT_DBG("conn %p", conn); |
189 | 189 | ||
190 | conn->preq[0] = SMP_CMD_PAIRING_REQ; | ||
191 | memcpy(&conn->preq[1], rp, sizeof(*rp)); | ||
190 | skb_pull(skb, sizeof(*rp)); | 192 | skb_pull(skb, sizeof(*rp)); |
191 | 193 | ||
192 | rp->io_capability = 0x00; | 194 | rp->io_capability = 0x00; |
@@ -196,17 +198,25 @@ static void smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb) | |||
196 | rp->resp_key_dist = 0x00; | 198 | rp->resp_key_dist = 0x00; |
197 | rp->auth_req &= (SMP_AUTH_BONDING | SMP_AUTH_MITM); | 199 | rp->auth_req &= (SMP_AUTH_BONDING | SMP_AUTH_MITM); |
198 | 200 | ||
201 | conn->prsp[0] = SMP_CMD_PAIRING_RSP; | ||
202 | memcpy(&conn->prsp[1], rp, sizeof(*rp)); | ||
203 | |||
199 | smp_send_cmd(conn, SMP_CMD_PAIRING_RSP, sizeof(*rp), rp); | 204 | smp_send_cmd(conn, SMP_CMD_PAIRING_RSP, sizeof(*rp), rp); |
200 | } | 205 | } |
201 | 206 | ||
202 | static void smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb) | 207 | static void smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb) |
203 | { | 208 | { |
209 | struct smp_cmd_pairing *rp = (void *) skb->data; | ||
204 | struct smp_cmd_pairing_confirm cp; | 210 | struct smp_cmd_pairing_confirm cp; |
205 | 211 | ||
206 | BT_DBG("conn %p", conn); | 212 | BT_DBG("conn %p", conn); |
207 | 213 | ||
208 | memset(&cp, 0, sizeof(cp)); | 214 | memset(&cp, 0, sizeof(cp)); |
209 | 215 | ||
216 | conn->prsp[0] = SMP_CMD_PAIRING_RSP; | ||
217 | memcpy(&conn->prsp[1], rp, sizeof(*rp)); | ||
218 | skb_pull(skb, sizeof(*rp)); | ||
219 | |||
210 | smp_send_cmd(conn, SMP_CMD_PAIRING_CONFIRM, sizeof(cp), &cp); | 220 | smp_send_cmd(conn, SMP_CMD_PAIRING_CONFIRM, sizeof(cp), &cp); |
211 | } | 221 | } |
212 | 222 | ||
@@ -266,6 +276,9 @@ static void smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb) | |||
266 | cp.resp_key_dist = 0x00; | 276 | cp.resp_key_dist = 0x00; |
267 | cp.auth_req = rp->auth_req & (SMP_AUTH_BONDING | SMP_AUTH_MITM); | 277 | cp.auth_req = rp->auth_req & (SMP_AUTH_BONDING | SMP_AUTH_MITM); |
268 | 278 | ||
279 | conn->preq[0] = SMP_CMD_PAIRING_REQ; | ||
280 | memcpy(&conn->preq[1], &cp, sizeof(cp)); | ||
281 | |||
269 | smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &cp); | 282 | smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &cp); |
270 | } | 283 | } |
271 | 284 | ||
@@ -303,6 +316,10 @@ int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level) | |||
303 | cp.init_key_dist = 0x00; | 316 | cp.init_key_dist = 0x00; |
304 | cp.resp_key_dist = 0x00; | 317 | cp.resp_key_dist = 0x00; |
305 | cp.auth_req = authreq; | 318 | cp.auth_req = authreq; |
319 | |||
320 | conn->preq[0] = SMP_CMD_PAIRING_REQ; | ||
321 | memcpy(&conn->preq[1], &cp, sizeof(cp)); | ||
322 | |||
306 | smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &cp); | 323 | smp_send_cmd(conn, SMP_CMD_PAIRING_REQ, sizeof(cp), &cp); |
307 | } else { | 324 | } else { |
308 | struct smp_cmd_security_req cp; | 325 | struct smp_cmd_security_req cp; |