* [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1
@ 2015-05-11 12:49 Mariusz Skamra
2015-05-11 12:49 ` [PATCH 2/5] shared/att: Add ext_signed flag to be able to use external crypto Mariusz Skamra
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Mariusz Skamra @ 2015-05-11 12:49 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Mariusz Skamra
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=Y, Size: 7388 bytes --]
This patch updates test case results, pics and instructions for
SM profile against android 5.1.
---
android/pics-sm.txt | 23 ++++++++++++++---------
android/pixit-sm.txt | 2 +-
android/pts-sm.txt | 38 ++++++++++++--------------------------
3 files changed, 27 insertions(+), 36 deletions(-)
diff --git a/android/pics-sm.txt b/android/pics-sm.txt
index c5caec6..c31fe76 100644
--- a/android/pics-sm.txt
+++ b/android/pics-sm.txt
@@ -1,8 +1,9 @@
SM PICS for the PTS tool.
-PTS version: 6.0
+PTS version: 6.1
* - different than PTS defaults
+^ - field not available on PTS
M - mandatory
O - optional
@@ -12,9 +13,11 @@ O - optional
Parameter Name Selected Description
-------------------------------------------------------------------------------
TSPC_SM_1_1 True Master Role (Initiator) (C.1)
-TSPC_SM_1_2 True Slave Role (Responder) (C.1)
+TSPC_SM_1_2 True Slave Role (Responder) (C.2)
-------------------------------------------------------------------------------
-C.1: At least one of these features shall be supported.
+C.1: Mandatory to support if TSPC_SM_1_2 is NOT supported, otherwise Optional
+C.2: Optional IF ((4.0 OR 4.0+HS) AND TSPC_GAP_5_3) OR ((4.1 OR 4.1+HS OR 4.2
+ OR 4.2+HS) AND (TSPC_GAP_5_3 OR TSPC_GAP_38_3)))
-------------------------------------------------------------------------------
@@ -26,8 +29,10 @@ TSPC_SM_2_1 True Authenticated MITM protection (O)
TSPC_SM_2_2 True Unauthenticated no MITM protection (C.1)
TSPC_SM_2_3 True No security requirements (M)
TSPC_SM_2_4 False (*) OOB supported (O)
+TSPC_SM_2_5 (^) LE Secure Connections (C.2)
-------------------------------------------------------------------------------
C.1: If TSPC_SM_2_1 is supported then Mandatory, else Optional
+C.2: Optional IF Core 4.2 OR Core 4.2+HS are supported, otherwise Excluded
-------------------------------------------------------------------------------
@@ -47,8 +52,8 @@ TSPC_SM_4_1 True Just Works (O)
TSPC_SM_4_2 True Passkey Entry (C.1)
TSPC_SM_4_3 False (*) Out of Band (C.1)
-------------------------------------------------------------------------------
-C.1: If TSPC_SM_2_1 is supported, at least one of these features shall be
- supported.
+C.1: Mandatory to support at least one of the defined methods IF TSPC_SM_2_1 is
+ supported, otherwise Excluded.
-------------------------------------------------------------------------------
@@ -63,7 +68,7 @@ TSPC_SM_5_4 True Slave Initiated Security – Master response(C.2)
-------------------------------------------------------------------------------
C.1: Mandatory if TSPC_SM_1_2 is supported, otherwise Excluded
C.2: Mandatory if TSPC_SM_1_1 is supported, otherwise Excluded
-C.3: Mandatory IF TSPC_SM_2_1 OR TSPC_SM_2_1 OR TSPC_SM_2_4 is supported,
+C.3: Mandatory IF TSPC_SM_2_1 OR TSPC_SM_2_2 OR TSPC_SM_2_4 is supported,
otherwise Excluded
-------------------------------------------------------------------------------
@@ -85,7 +90,7 @@ TSPC_SM_7_1 True Encryption Key (C.1)
TSPC_SM_7_2 True Identity Key (C.2)
TSPC_SM_7_3 True Signing Key (C.3)
-------------------------------------------------------------------------------
-C.1: Mandatory if GAP (24/2 OR 42/6) is supported, ELSE Optional
-C.2: Mandatory if GAP (26/3) is supported, ELSE Optional
-C.3: Mandatory if GAP (25/6 OR 35/6) is supported, ELSE Optional
+C.1: Mandatory if TSPC_GAP_24_2 OR TSPC_GAP_42_6 is supported, ELSE Optional
+C.2: Mandatory if TSPC_GAP_26_3 is supported, ELSE Optional
+C.3: Mandatory if TSPC_GAP_25_6 OR TSPC_GAP_35_6 is supported, ELSE Optional
-------------------------------------------------------------------------------
diff --git a/android/pixit-sm.txt b/android/pixit-sm.txt
index 98e2ab5..6facbb8 100644
--- a/android/pixit-sm.txt
+++ b/android/pixit-sm.txt
@@ -1,6 +1,6 @@
SM PIXIT for the PTS tool.
-PTS version: 6.0
+PTS version: 6.1
* - different than PTS defaults
& - should be set to IUT Bluetooth address
diff --git a/android/pts-sm.txt b/android/pts-sm.txt
index 91737cc..9b9e120 100644
--- a/android/pts-sm.txt
+++ b/android/pts-sm.txt
@@ -1,8 +1,8 @@
PTS test results for SM
-PTS version: 6.0
-Tested: 11-February-2015
-Android version: 5.0
+PTS version: 6.1
+Tested: 04-May-2015
+Android version: 5.1
kernel version: 3.20
Results:
@@ -24,12 +24,7 @@ TC_JW_BV_02_C PASS btmgmt advertising on
TC_JW_BV_05_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
TC_JW_BI_01_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
TC_JW_BI_02_C PASS btmgmt pairable on
-TC_JW_BI_03_C PASS bluetoothd is NOT running
- btmgmt power on
- btmgmt le on
- btmgmt connectable on
- btmgmt pairable on
- btmgmt discov on
+TC_JW_BI_03_C PASS btmgmt pairable on
btmgmt advertising on
TC_JW_BI_04_C PASS btmgmt pairable off
btmgmg pair -c 0x03 -t 0x01 <addr>
@@ -38,8 +33,6 @@ TC_PKE_BV_01_C PASS btmgmt pairable off
Note: provide passkey to PTS
TC_PKE_BV_02_C PASS btmgmt pairable off
btmgmt io-cap 0x04
- btmgmt advertising on
- btmgmt monitor
Note: provide passkey
TC_PKE_BV_04_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
TC_PKE_BV_05_C PASS btmgmt io-cap 0x04
@@ -50,7 +43,6 @@ TC_PKE_BI_02_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
Note: provide passkey
TC_PKE_BI_03_C PASS btmgmt io-cap 0x04
btmgmt advertising on
- btmgmt monitor
Note: Enter invalid passkey in PTS
TC_OOB_BV_01_C N/A
TC_OOB_BV_02_C N/A
@@ -59,12 +51,10 @@ TC_OOB_BV_04_C N/A
TC_OOB_BV_05_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
Note: Enter valid passkey in PTS
TC_OOB_BV_06_C PASS btmgmt advertising on
- btmgmt monitor
Note: Enter valid passkey in PTS
TC_OOB_BV_07_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
TC_OOB_BV_08_C PASS btmgmt advertising on
- btmgmt monitor
- Note: Accept pairing in btmgmt monitor
+ Note: Accept pairing in btmgmt
TC_OOB_BV_09_C N/A
TC_OOB_BV_10_C N/A
TC_OOB_BI_01_C N/A
@@ -72,17 +62,15 @@ TC_OOB_BI_02_C N/A
TC_EKS_BV_01_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
Note: Enter valid passkey in PTS
TC_EKS_BV_02_C PASS btmgmt advertising on
- btmgmt monitor
- Note: Accept pairing in btmgmt monitor
-TC_EKS_BI_01_C PASS btmgmt io-cap 0x03
- btmgmt pair -c 0x03 -t 0x01 <addr>
+ Note: Accept pairing in btmgmt
+TC_EKS_BI_01_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
TC_EKS_BI_02_C PASS btmgmt advertising on
TC_SIGN_BV_01_C INC PTS issue #12305
-TC_SIGN_BV_03_C PASS haltest:
+TC_SIGN_BV_03_C INC haltest:
gattc register_client 1234
gattc listen 1 1
Note: IUT must be connectable and discoverable
-TC_SIGN_BI_01_C PASS haltest:
+TC_SIGN_BI_01_C INC haltest:
gattc register client 1234
gattc listen 1 1
Note: IUT must be connectable and discoverable
@@ -108,9 +96,7 @@ TC_KDU_BV_05_C PASS PTS issue #12302
TC_KDU_BV_06_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
TC_KDU_BV_07_C PASS btmgmt pairable on
TC_SIP_BV_01_C PASS btmgmt advertising on
- btmgmt pair -c 0x03 -t 0x01 <addr>
-TC_SIP_BV_02_C PASS btmgmt advertising off
- l2test -n -J4 -V le_public <addr>
-TC_SIE_BV_01_C PASS btmgmt advertising on
- btmgmt pair -c 0x03 -t 0x01 <addr>
+TC_SIP_BV_02_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
+TC_SIE_BV_01_C PASS btmgmt io-cap 0x03
+ btmgmt advertising on
-------------------------------------------------------------------------------
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] shared/att: Add ext_signed flag to be able to use external crypto
2015-05-11 12:49 [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1 Mariusz Skamra
@ 2015-05-11 12:49 ` Mariusz Skamra
2015-05-11 12:49 ` [PATCH 3/5] android/pts: Update GAP test results Mariusz Skamra
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Mariusz Skamra @ 2015-05-11 12:49 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Mariusz Skamra
Due to the issues with CSRK tests ext_signed flag has been added to
allow android/gatt handle signed write operations.
This patch fixes following tests:
GAP__TC_SEC_CSIGN_BV_02_C
GAP__TC_SEC_CSIGN_BI_01_C
GAP__TC_SEC_CSIGN_BI_02_C
GAP__TC_SEC_CSIGN_BI_03_C
GAP__TC_SEC_CSIGN_BI_04_C
SM__TC_SIGN_BV_03_C
---
android/gatt.c | 2 +-
attrib/gattrib.c | 4 ++--
attrib/gattrib.h | 2 +-
attrib/gatttool.c | 2 +-
attrib/interactive.c | 2 +-
peripheral/gatt.c | 2 +-
src/device.c | 2 +-
src/shared/att.c | 10 ++++++----
src/shared/att.h | 2 +-
tools/btgatt-client.c | 2 +-
tools/btgatt-server.c | 2 +-
unit/test-gatt.c | 2 +-
unit/test-gattrib.c | 2 +-
unit/test-hog.c | 2 +-
14 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/android/gatt.c b/android/gatt.c
index 4da959f..1f131e8 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -1564,7 +1564,7 @@ static void connect_cb(GIOChannel *io, GError *gerr, gpointer user_data)
if (cid == ATT_CID)
mtu = ATT_DEFAULT_LE_MTU;
- attrib = g_attrib_new(io, mtu);
+ attrib = g_attrib_new(io, mtu, true);
if (!attrib) {
error("gatt: unable to create new GAttrib instance");
device_set_state(dev, DEVICE_DISCONNECTED);
diff --git a/attrib/gattrib.c b/attrib/gattrib.c
index 2011359..2e1e39a 100644
--- a/attrib/gattrib.c
+++ b/attrib/gattrib.c
@@ -95,7 +95,7 @@ static struct id_pair *store_id(GAttrib *attrib, unsigned int org_id,
return NULL;
}
-GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu)
+GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu, bool ext_signed)
{
gint fd;
GAttrib *attr;
@@ -111,7 +111,7 @@ GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu)
g_io_channel_ref(io);
attr->io = io;
- attr->att = bt_att_new(fd);
+ attr->att = bt_att_new(fd, ext_signed);
if (!attr->att)
goto fail;
diff --git a/attrib/gattrib.h b/attrib/gattrib.h
index 374bac2..611f952 100644
--- a/attrib/gattrib.h
+++ b/attrib/gattrib.h
@@ -42,7 +42,7 @@ typedef void (*GAttribDebugFunc)(const char *str, gpointer user_data);
typedef void (*GAttribNotifyFunc)(const guint8 *pdu, guint16 len,
gpointer user_data);
-GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu);
+GAttrib *g_attrib_new(GIOChannel *io, guint16 mtu, bool ext_signed);
GAttrib *g_attrib_ref(GAttrib *attrib);
void g_attrib_unref(GAttrib *attrib);
diff --git a/attrib/gatttool.c b/attrib/gatttool.c
index 1a40c94..95bd20a 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
@@ -148,7 +148,7 @@ static void connect_cb(GIOChannel *io, GError *err, gpointer user_data)
if (cid == ATT_CID)
mtu = ATT_DEFAULT_LE_MTU;
- attrib = g_attrib_new(io, mtu);
+ attrib = g_attrib_new(io, mtu, false);
if (opt_listen)
g_idle_add(listen_start, attrib);
diff --git a/attrib/interactive.c b/attrib/interactive.c
index 451be23..7d4786a 100644
--- a/attrib/interactive.c
+++ b/attrib/interactive.c
@@ -174,7 +174,7 @@ static void connect_cb(GIOChannel *io, GError *err, gpointer user_data)
if (cid == ATT_CID)
mtu = ATT_DEFAULT_LE_MTU;
- attrib = g_attrib_new(iochannel, mtu);
+ attrib = g_attrib_new(iochannel, mtu, false);
g_attrib_register(attrib, ATT_OP_HANDLE_NOTIFY, GATTRIB_ALL_HANDLES,
events_handler, attrib, NULL);
g_attrib_register(attrib, ATT_OP_HANDLE_IND, GATTRIB_ALL_HANDLES,
diff --git a/peripheral/gatt.c b/peripheral/gatt.c
index 8df62a6..554124e 100644
--- a/peripheral/gatt.c
+++ b/peripheral/gatt.c
@@ -116,7 +116,7 @@ static struct gatt_conn *gatt_conn_new(int fd)
if (!conn)
return NULL;
- conn->att = bt_att_new(fd);
+ conn->att = bt_att_new(fd, false);
if (!conn->att) {
fprintf(stderr, "Failed to initialze ATT transport layer\n");
free(conn);
diff --git a/src/device.c b/src/device.c
index 8b678a9..88440d9 100644
--- a/src/device.c
+++ b/src/device.c
@@ -4272,7 +4272,7 @@ bool device_attach_att(struct btd_device *dev, GIOChannel *io)
}
dev->att_mtu = MIN(mtu, BT_ATT_MAX_LE_MTU);
- attrib = g_attrib_new(io, dev->att_mtu);
+ attrib = g_attrib_new(io, dev->att_mtu, false);
if (!attrib) {
error("Unable to create new GAttrib instance");
return false;
diff --git a/src/shared/att.c b/src/shared/att.c
index c5eaa09..053aa47 100644
--- a/src/shared/att.c
+++ b/src/shared/att.c
@@ -82,6 +82,7 @@ struct bt_att {
void *debug_data;
struct bt_crypto *crypto;
+ bool ext_signed;
struct sign_info *local_sign;
struct sign_info *remote_sign;
@@ -732,7 +733,7 @@ static void handle_notify(struct bt_att *att, uint8_t opcode, uint8_t *pdu,
const struct queue_entry *entry;
bool found;
- if (opcode & ATT_OP_SIGNED_MASK) {
+ if (opcode & ATT_OP_SIGNED_MASK & !att->ext_signed) {
if (!handle_signed(att, opcode, pdu, pdu_len))
return;
pdu_len -= BT_ATT_SIGNATURE_LEN;
@@ -900,7 +901,7 @@ static void bt_att_free(struct bt_att *att)
free(att);
}
-struct bt_att *bt_att_new(int fd)
+struct bt_att *bt_att_new(int fd, bool ext_signed)
{
struct bt_att *att;
@@ -912,7 +913,7 @@ struct bt_att *bt_att_new(int fd)
return NULL;
att->fd = fd;
-
+ att->ext_signed = ext_signed;
att->mtu = BT_ATT_DEFAULT_LE_MTU;
att->buf = malloc(att->mtu);
if (!att->buf)
@@ -923,7 +924,8 @@ struct bt_att *bt_att_new(int fd)
goto fail;
/* crypto is optional, if not available leave it NULL */
- att->crypto = bt_crypto_new();
+ if (!ext_signed)
+ att->crypto = bt_crypto_new();
att->req_queue = queue_new();
if (!att->req_queue)
diff --git a/src/shared/att.h b/src/shared/att.h
index 80810a1..2a7f87e 100644
--- a/src/shared/att.h
+++ b/src/shared/att.h
@@ -28,7 +28,7 @@
struct bt_att;
-struct bt_att *bt_att_new(int fd);
+struct bt_att *bt_att_new(int fd, bool ext_signed);
struct bt_att *bt_att_ref(struct bt_att *att);
void bt_att_unref(struct bt_att *att);
diff --git a/tools/btgatt-client.c b/tools/btgatt-client.c
index fbc01db..1fc8730 100644
--- a/tools/btgatt-client.c
+++ b/tools/btgatt-client.c
@@ -179,7 +179,7 @@ static struct client *client_create(int fd, uint16_t mtu)
return NULL;
}
- cli->att = bt_att_new(fd);
+ cli->att = bt_att_new(fd, false);
if (!cli->att) {
fprintf(stderr, "Failed to initialze ATT transport layer\n");
bt_att_unref(cli->att);
diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
index b30a958..292b584 100644
--- a/tools/btgatt-server.c
+++ b/tools/btgatt-server.c
@@ -548,7 +548,7 @@ static struct server *server_create(int fd, uint16_t mtu, bool hr_visible)
return NULL;
}
- server->att = bt_att_new(fd);
+ server->att = bt_att_new(fd, false);
if (!server->att) {
fprintf(stderr, "Failed to initialze ATT transport layer\n");
goto fail;
diff --git a/unit/test-gatt.c b/unit/test-gatt.c
index a7ea7cd..40e2ca9 100644
--- a/unit/test-gatt.c
+++ b/unit/test-gatt.c
@@ -647,7 +647,7 @@ static struct context *create_context(uint16_t mtu, gconstpointer data)
err = socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0, sv);
g_assert(err == 0);
- context->att = bt_att_new(sv[0]);
+ context->att = bt_att_new(sv[0], false);
g_assert(context->att);
switch (test_data->context_type) {
diff --git a/unit/test-gattrib.c b/unit/test-gattrib.c
index 28542f3..416e596 100644
--- a/unit/test-gattrib.c
+++ b/unit/test-gattrib.c
@@ -92,7 +92,7 @@ static void setup_context(struct context *cxt, gconstpointer data)
g_io_channel_set_encoding(cxt->server_io, NULL, NULL);
g_io_channel_set_buffered(cxt->server_io, FALSE);
- cxt->att = g_attrib_new(cxt->att_io, DEFAULT_MTU);
+ cxt->att = g_attrib_new(cxt->att_io, DEFAULT_MTU, false);
g_assert(cxt->att != NULL);
}
diff --git a/unit/test-hog.c b/unit/test-hog.c
index 778f087..24731d7 100644
--- a/unit/test-hog.c
+++ b/unit/test-hog.c
@@ -187,7 +187,7 @@ static struct context *create_context(gconstpointer data)
g_io_channel_set_close_on_unref(att_io, TRUE);
- context->attrib = g_attrib_new(att_io, 23);
+ context->attrib = g_attrib_new(att_io, 23, false);
g_assert(context->attrib);
g_io_channel_unref(att_io);
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] android/pts: Update GAP test results
2015-05-11 12:49 [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1 Mariusz Skamra
2015-05-11 12:49 ` [PATCH 2/5] shared/att: Add ext_signed flag to be able to use external crypto Mariusz Skamra
@ 2015-05-11 12:49 ` Mariusz Skamra
2015-05-11 12:49 ` [PATCH 4/5] android/pts: Update SM " Mariusz Skamra
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Mariusz Skamra @ 2015-05-11 12:49 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Mariusz Skamra
PTS 6.1 and Android 5.1
---
android/pics-gap.txt | 9 ++++++--
android/pixit-gap.txt | 6 +++---
android/pts-gap.txt | 60 ++++++++++++++++++++++-----------------------------
3 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/android/pics-gap.txt b/android/pics-gap.txt
index 466f451..f985d98 100644
--- a/android/pics-gap.txt
+++ b/android/pics-gap.txt
@@ -63,11 +63,16 @@ TSPC_GAP_1_4 True Non-connectable mode (O)
TSPC_GAP_1_5 True Connectable mode (M)
TSPC_GAP_1_6 True Non-bondable mode (O)
TSPC_GAP_1_7 True Bondable mode (C.2)
-TSPC_GAP_1_8 False (*) Non-Synchronizable Mode (O)
-TSPC_GAP_1_9 False (*) Synchronizable Mode (O)
+TSPC_GAP_1_8 False (*) Non-Synchronizable Mode (C.3)
+TSPC_GAP_1_9 False (*) Synchronizable Mode (C.4)
-------------------------------------------------------------------------------
C.1: Mandatory if TSPC_GAP_0_2 is supported, otherwise Optional.
C.2: Mandatory if TSPC_GAP_3_5 is supported, otherwise Optional.
+C.3: Mandatory if TSPC_GAP_0A_2 or TSPC_GAP_0A_3 and is supported, otherwise
+ Excluded.
+C.4: Optional if TSPC_GAP_0A_2 or later is supported; Mandatory if TSPC_GAP_0A_2
+ or later and BB 3a/1 (Connectionless Slave Broadcast Transmitter) are
+ supported, otherwise Excluded.
-------------------------------------------------------------------------------
diff --git a/android/pixit-gap.txt b/android/pixit-gap.txt
index 7a7107c..5a3fc6f 100644
--- a/android/pixit-gap.txt
+++ b/android/pixit-gap.txt
@@ -11,7 +11,7 @@ PTS version: 6.0
Parameter Name Value
-------------------------------------------------------------------------------
TSPX_bd_addr_iut 112233445566 (*&)
-TSPX_bd_addr_PTS 000000000000
+TSPX_bd_addr_PTS C000DEADBEEF
TSPX_broadcaster_class_of_device 100104
TSPX_observer_class_of_device 100104
TSPX_peripheral_class_of_device 100104
@@ -36,8 +36,8 @@ TSPX_iut_privacy_enabled False
TSPX_psm 1001
TSPX_iut_valid_connection_interval_min 00C8
TSPX_iut_valid_conneciton_interval_max 0960
-TSPX_iut_valid_connection_latency 0007
-TSPX_iut_valid_timeout_multiplier 0960
+TSPX_iut_valid_connection_latency 0006
+TSPX_iut_valid_timeout_multiplier 0962
TSPX_iut_connection_parameter_timeout 30000
TSPX_iut_invalid_connection_interval_min 0000
TSPX_iut_invalid_conneciton_interval_max 0000
diff --git a/android/pts-gap.txt b/android/pts-gap.txt
index cc87bc5..fe42d86 100644
--- a/android/pts-gap.txt
+++ b/android/pts-gap.txt
@@ -1,9 +1,9 @@
PTS test results for GAP
-PTS version: 6.0
-Tested: 19-January-2015
-Android version: 5.0
-Kernel version: 3.18
+PTS version: 6.1
+Tested: 11-May-2015
+Android version: 5.1
+Kernel version: 4.1
Results:
PASS test passed
@@ -265,13 +265,13 @@ TC_SEC_AUT_BV_23_C PASS haltest: gattc register_client
gatts send_response 3 1 0 1d 0 0x1234
TC_SEC_AUT_BV_24_C PASS haltest: gatts register_server
gatts add_service 1 <uuid> 3
- gatts add_characteristic 1 1b <uuid> 10 34
- gatts start_service 1 1b 1
+ gatts add_characteristic 1 1d <uuid> 10 34
+ gatts start_service 1 1d 1
gatts connect
gatts disconnect
gatts connect
PTS asks for handle with insufficient encryption
- gatts send_response 2 1 0 1d 0 0x1234
+ gatts send_response 2 1 0 1f 0 0x1234
TC_SEC_CSIGN_BV_01_C PASS haltest:
gattc connect
bluetooth create_bond
@@ -281,15 +281,15 @@ TC_SEC_CSIGN_BV_01_C PASS haltest:
TC_SEC_CSIGN_BV_02_C PASS haltest: gattc register_client
gatts register_server
gatts add_service 2 <uuid> 3
- gatts add_characteristic 2 1b <uuid> 66 129
- gatts start_service 2 1b 1
+ gatts add_characteristic 2 1d <uuid> 66 129
+ gatts start_service 2 1d 1
gattc listen 1
gatts disconnect
TC_SEC_CSIGN_BI_01_C PASS gattc register_client
gatts register_server
gatts add_service 2 <uuid> 3
- gatts add_characteristic 2 1b <uuid> 66 129
- gatts start_service 2 1b 1
+ gatts add_characteristic 2 1d <uuid> 66 129
+ gatts start_service 2 1d 1
gattc listen 1
gatts disconnect
gattc disconnect
@@ -377,15 +377,15 @@ TC_DM_CON_BV_01_C PASS bluetooth set_adapter_property
BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
gattc register_client
gattc listen 1
-TC_DM_NBON_BV_01_C PASS btmgmt bondable off
-TC_DM_BON_BV_01_C PASS haltest:
- create_bond and remove_bond when requested
+TC_DM_NBON_BV_01_C PASS btmgmt pairable off
+ btmgmt pair -c 0x04 -t 0x01 <addr>
+TC_DM_BON_BV_01_C PASS btmgmt pairable on
+ btmgmt pair -c 0x04 -t 0x01 <addr>
TC_DM_GIN_BV_01_C PASS
TC_DM_LIN_BV_01_C PASS
-TC_DM_NAD_BV_01_C PASS Start discovery from IUT
+TC_DM_NAD_BV_01_C PASS btmgmt find
TC_DM_NAD_BV_02_C PASS
-TC_DM_LEP_BV_01_C PASS PTS issue #12949
- bluetooth set_adapter_property
+TC_DM_LEP_BV_01_C PASS bluetooth set_adapter_property
BT_PROPERTY_ADAPTER_SCAN_MODE
BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
gattc register_client
@@ -393,18 +393,18 @@ TC_DM_LEP_BV_01_C PASS PTS issue #12949
TC_DM_LEP_BV_02_C PASS Use basic rate PTS dongle
haltest:
bluetooth set_adapter_property
-TC_DM_LEP_BV_04_C PASS l2test -n <PTS bdaddr>
-TC_DM_LEP_BV_05_C PASS btmgmt find -b
+TC_DM_LEP_BV_04_C PASS haltest:
+ gattc connect <PTS bdaddr>
+TC_DM_LEP_BV_05_C PASS Use basic rate PTS dongle
+ btmgmt find -b
l2test -n <PTS bdaddr>
TC_DM_LEP_BV_06_C PASS gattc connect
-TC_DM_LEP_BV_07_C PASS PTS issue #12949
- bluetooth set_adapter_property
+TC_DM_LEP_BV_07_C PASS bluetooth set_adapter_property
BT_PROPERTY_ADAPTER_SCAN_MODE
BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
gattc register_client
gattc listen 1 1
-TC_DM_LEP_BV_08_C PASS PTS issue #12949
- bluetooth set_adapter_property
+TC_DM_LEP_BV_08_C PASS bluetooth set_adapter_property
BT_PROPERTY_ADAPTER_SCAN_MODE
BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
gattc register_client
@@ -415,19 +415,11 @@ TC_DM_LEP_BV_09_C PASS haltest:
BT_PROPERTY_ADAPTER_SCAN_MODE
BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
gattc register_client
- bluetooth start_discovery
- gattc connect
+ gattc scan 1
+ gattc connect <PTS addr>
l2test -n -P 31 <PTS addr>
disconnect
-TC_DM_LEP_BV_10_C PASS PTS issue #12949
- haltest:
- bluetooth enable
- bluetooth set_adapter_property
- BT_PROPERTY_ADAPTER_SCAN_MODE
- BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
- gattc register_client
- gattc listen
- bluetooth start_discovery
+TC_DM_LEP_BV_10_C PASS btmgmt find
l2test -n -P 31 <PTS addr>
TC_DM_LEP_BV_11_C PASS haltest:
bluetooth enable
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] android/pts: Update SM test results
2015-05-11 12:49 [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1 Mariusz Skamra
2015-05-11 12:49 ` [PATCH 2/5] shared/att: Add ext_signed flag to be able to use external crypto Mariusz Skamra
2015-05-11 12:49 ` [PATCH 3/5] android/pts: Update GAP test results Mariusz Skamra
@ 2015-05-11 12:49 ` Mariusz Skamra
2015-05-11 12:49 ` [PATCH 5/5] android/pts: Update DID " Mariusz Skamra
2015-05-19 14:45 ` [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1 Szymon Janc
4 siblings, 0 replies; 7+ messages in thread
From: Mariusz Skamra @ 2015-05-11 12:49 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Mariusz Skamra
PTS 6.1 and Android 5.1
---
android/pts-sm.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/android/pts-sm.txt b/android/pts-sm.txt
index 9b9e120..1fad305 100644
--- a/android/pts-sm.txt
+++ b/android/pts-sm.txt
@@ -3,7 +3,7 @@ PTS test results for SM
PTS version: 6.1
Tested: 04-May-2015
Android version: 5.1
-kernel version: 3.20
+kernel version: 4.1
Results:
PASS test passed
@@ -66,11 +66,11 @@ TC_EKS_BV_02_C PASS btmgmt advertising on
TC_EKS_BI_01_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
TC_EKS_BI_02_C PASS btmgmt advertising on
TC_SIGN_BV_01_C INC PTS issue #12305
-TC_SIGN_BV_03_C INC haltest:
+TC_SIGN_BV_03_C PASS haltest:
gattc register_client 1234
gattc listen 1 1
Note: IUT must be connectable and discoverable
-TC_SIGN_BI_01_C INC haltest:
+TC_SIGN_BI_01_C PASS haltest:
gattc register client 1234
gattc listen 1 1
Note: IUT must be connectable and discoverable
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] android/pts: Update DID test results
2015-05-11 12:49 [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1 Mariusz Skamra
` (2 preceding siblings ...)
2015-05-11 12:49 ` [PATCH 4/5] android/pts: Update SM " Mariusz Skamra
@ 2015-05-11 12:49 ` Mariusz Skamra
2015-05-19 14:45 ` [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1 Szymon Janc
4 siblings, 0 replies; 7+ messages in thread
From: Mariusz Skamra @ 2015-05-11 12:49 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Mariusz Skamra
PTS 6.1 and Android 5.1
---
android/pics-did.txt | 2 +-
android/pixit-did.txt | 2 +-
android/pts-did.txt | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/android/pics-did.txt b/android/pics-did.txt
index da2e090..9ecb86d 100644
--- a/android/pics-did.txt
+++ b/android/pics-did.txt
@@ -1,6 +1,6 @@
DID PICS for the PTS tool.
-PTS version: 6.0
+PTS version: 6.1
* - different than PTS defaults
# - not yet implemented/supported
diff --git a/android/pixit-did.txt b/android/pixit-did.txt
index 295febc..0a0f1cc 100644
--- a/android/pixit-did.txt
+++ b/android/pixit-did.txt
@@ -1,6 +1,6 @@
DID PIXIT for the PTS tool.
-PTS version: 6.0
+PTS version: 6.1
* - different than PTS defaults
& - should be set to IUT Bluetooth address
diff --git a/android/pts-did.txt b/android/pts-did.txt
index 8fd434d..f44bf8f 100644
--- a/android/pts-did.txt
+++ b/android/pts-did.txt
@@ -1,8 +1,8 @@
PTS test results for DID
-PTS version: 6.0
-Tested: 22-January-2015
-Android version: 5.0
+PTS version: 6.1
+Tested: 04-May-2015
+Android version: 5.1
Results:
PASS test passed
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1
2015-05-11 12:49 [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1 Mariusz Skamra
` (3 preceding siblings ...)
2015-05-11 12:49 ` [PATCH 5/5] android/pts: Update DID " Mariusz Skamra
@ 2015-05-19 14:45 ` Szymon Janc
2015-05-20 9:53 ` Skamra Mariusz
4 siblings, 1 reply; 7+ messages in thread
From: Szymon Janc @ 2015-05-19 14:45 UTC (permalink / raw)
To: Mariusz Skamra; +Cc: linux-bluetooth
Hi Mariusz,
On Monday 11 of May 2015 14:49:44 Mariusz Skamra wrote:
> This patch updates test case results, pics and instructions for
> SM profile against android 5.1.
> ---
> android/pics-sm.txt | 23 ++++++++++++++---------
> android/pixit-sm.txt | 2 +-
> android/pts-sm.txt | 38 ++++++++++++--------------------------
> 3 files changed, 27 insertions(+), 36 deletions(-)
>
> diff --git a/android/pics-sm.txt b/android/pics-sm.txt
> index c5caec6..c31fe76 100644
> --- a/android/pics-sm.txt
> +++ b/android/pics-sm.txt
> @@ -1,8 +1,9 @@
> SM PICS for the PTS tool.
>
> -PTS version: 6.0
> +PTS version: 6.1
>
> * - different than PTS defaults
> +^ - field not available on PTS
>
> M - mandatory
> O - optional
> @@ -12,9 +13,11 @@ O - optional
> Parameter Name Selected Description
> ---------------------------------------------------------------------------
> ---- TSPC_SM_1_1 True Master Role (Initiator) (C.1)
> -TSPC_SM_1_2 True Slave Role (Responder) (C.1)
> +TSPC_SM_1_2 True Slave Role (Responder) (C.2)
> ---------------------------------------------------------------------------
> ---- -C.1: At least one of these features shall be supported.
> +C.1: Mandatory to support if TSPC_SM_1_2 is NOT supported, otherwise
> Optional +C.2: Optional IF ((4.0 OR 4.0+HS) AND TSPC_GAP_5_3) OR ((4.1 OR
> 4.1+HS OR 4.2 + OR 4.2+HS) AND (TSPC_GAP_5_3 OR TSPC_GAP_38_3)))
> ---------------------------------------------------------------------------
> ----
>
>
> @@ -26,8 +29,10 @@ TSPC_SM_2_1 True Authenticated MITM protection
(O)
> TSPC_SM_2_2 True Unauthenticated no MITM protection (C.1)
> TSPC_SM_2_3 True No security requirements (M)
> TSPC_SM_2_4 False (*) OOB supported (O)
> +TSPC_SM_2_5 (^) LE Secure Connections (C.2)
> ---------------------------------------------------------------------------
> ---- C.1: If TSPC_SM_2_1 is supported then Mandatory, else Optional
> +C.2: Optional IF Core 4.2 OR Core 4.2+HS are supported, otherwise Excluded
> ---------------------------------------------------------------------------
> ----
>
>
> @@ -47,8 +52,8 @@ TSPC_SM_4_1 True Just Works (O)
> TSPC_SM_4_2 True Passkey Entry (C.1)
> TSPC_SM_4_3 False (*) Out of Band (C.1)
> ---------------------------------------------------------------------------
> ---- -C.1: If TSPC_SM_2_1 is supported, at least one of these features shall
> be - supported.
> +C.1: Mandatory to support at least one of the defined methods IF
> TSPC_SM_2_1 is + supported, otherwise Excluded.
> ---------------------------------------------------------------------------
> ----
>
>
> @@ -63,7 +68,7 @@ TSPC_SM_5_4 True Slave Initiated Security – Master
> response(C.2)
> ---------------------------------------------------------------------------
> ---- C.1: Mandatory if TSPC_SM_1_2 is supported, otherwise Excluded
> C.2: Mandatory if TSPC_SM_1_1 is supported, otherwise Excluded
> -C.3: Mandatory IF TSPC_SM_2_1 OR TSPC_SM_2_1 OR TSPC_SM_2_4 is supported,
> +C.3: Mandatory IF TSPC_SM_2_1 OR TSPC_SM_2_2 OR TSPC_SM_2_4 is supported,
> otherwise Excluded
> ---------------------------------------------------------------------------
> ----
>
> @@ -85,7 +90,7 @@ TSPC_SM_7_1 True Encryption Key (C.1)
> TSPC_SM_7_2 True Identity Key (C.2)
> TSPC_SM_7_3 True Signing Key (C.3)
> ---------------------------------------------------------------------------
> ---- -C.1: Mandatory if GAP (24/2 OR 42/6) is supported, ELSE Optional
> -C.2: Mandatory if GAP (26/3) is supported, ELSE Optional
> -C.3: Mandatory if GAP (25/6 OR 35/6) is supported, ELSE Optional
> +C.1: Mandatory if TSPC_GAP_24_2 OR TSPC_GAP_42_6 is supported, ELSE
> Optional +C.2: Mandatory if TSPC_GAP_26_3 is supported, ELSE Optional
> +C.3: Mandatory if TSPC_GAP_25_6 OR TSPC_GAP_35_6 is supported, ELSE
> Optional
> ---------------------------------------------------------------------------
> ---- diff --git a/android/pixit-sm.txt b/android/pixit-sm.txt
> index 98e2ab5..6facbb8 100644
> --- a/android/pixit-sm.txt
> +++ b/android/pixit-sm.txt
> @@ -1,6 +1,6 @@
> SM PIXIT for the PTS tool.
>
> -PTS version: 6.0
> +PTS version: 6.1
>
> * - different than PTS defaults
> & - should be set to IUT Bluetooth address
> diff --git a/android/pts-sm.txt b/android/pts-sm.txt
> index 91737cc..9b9e120 100644
> --- a/android/pts-sm.txt
> +++ b/android/pts-sm.txt
> @@ -1,8 +1,8 @@
> PTS test results for SM
>
> -PTS version: 6.0
> -Tested: 11-February-2015
> -Android version: 5.0
> +PTS version: 6.1
> +Tested: 04-May-2015
> +Android version: 5.1
> kernel version: 3.20
>
> Results:
> @@ -24,12 +24,7 @@ TC_JW_BV_02_C PASS btmgmt advertising on
> TC_JW_BV_05_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
> TC_JW_BI_01_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
> TC_JW_BI_02_C PASS btmgmt pairable on
> -TC_JW_BI_03_C PASS bluetoothd is NOT running
> - btmgmt power on
> - btmgmt le on
> - btmgmt connectable on
> - btmgmt pairable on
> - btmgmt discov on
> +TC_JW_BI_03_C PASS btmgmt pairable on
> btmgmt advertising on
> TC_JW_BI_04_C PASS btmgmt pairable off
> btmgmg pair -c 0x03 -t 0x01 <addr>
> @@ -38,8 +33,6 @@ TC_PKE_BV_01_C PASS btmgmt pairable off
> Note: provide passkey to PTS
> TC_PKE_BV_02_C PASS btmgmt pairable off
> btmgmt io-cap 0x04
> - btmgmt advertising on
> - btmgmt monitor
> Note: provide passkey
> TC_PKE_BV_04_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
> TC_PKE_BV_05_C PASS btmgmt io-cap 0x04
> @@ -50,7 +43,6 @@ TC_PKE_BI_02_C PASS btmgmt pair -c 0x04 -t 0x01
<addr>
> Note: provide passkey
> TC_PKE_BI_03_C PASS btmgmt io-cap 0x04
> btmgmt advertising on
> - btmgmt monitor
> Note: Enter invalid passkey in PTS
> TC_OOB_BV_01_C N/A
> TC_OOB_BV_02_C N/A
> @@ -59,12 +51,10 @@ TC_OOB_BV_04_C N/A
> TC_OOB_BV_05_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
> Note: Enter valid passkey in PTS
> TC_OOB_BV_06_C PASS btmgmt advertising on
> - btmgmt monitor
> Note: Enter valid passkey in PTS
> TC_OOB_BV_07_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
> TC_OOB_BV_08_C PASS btmgmt advertising on
> - btmgmt monitor
> - Note: Accept pairing in btmgmt monitor
> + Note: Accept pairing in btmgmt
> TC_OOB_BV_09_C N/A
> TC_OOB_BV_10_C N/A
> TC_OOB_BI_01_C N/A
> @@ -72,17 +62,15 @@ TC_OOB_BI_02_C N/A
> TC_EKS_BV_01_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
> Note: Enter valid passkey in PTS
> TC_EKS_BV_02_C PASS btmgmt advertising on
> - btmgmt monitor
> - Note: Accept pairing in btmgmt monitor
> -TC_EKS_BI_01_C PASS btmgmt io-cap 0x03
> - btmgmt pair -c 0x03 -t 0x01 <addr>
> + Note: Accept pairing in btmgmt
> +TC_EKS_BI_01_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
> TC_EKS_BI_02_C PASS btmgmt advertising on
> TC_SIGN_BV_01_C INC PTS issue #12305
> -TC_SIGN_BV_03_C PASS haltest:
> +TC_SIGN_BV_03_C INC haltest:
> gattc register_client 1234
> gattc listen 1 1
> Note: IUT must be connectable and discoverable
> -TC_SIGN_BI_01_C PASS haltest:
> +TC_SIGN_BI_01_C INC haltest:
> gattc register client 1234
> gattc listen 1 1
> Note: IUT must be connectable and discoverable
> @@ -108,9 +96,7 @@ TC_KDU_BV_05_C PASS PTS issue #12302
> TC_KDU_BV_06_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
> TC_KDU_BV_07_C PASS btmgmt pairable on
> TC_SIP_BV_01_C PASS btmgmt advertising on
> - btmgmt pair -c 0x03 -t 0x01 <addr>
> -TC_SIP_BV_02_C PASS btmgmt advertising off
> - l2test -n -J4 -V le_public <addr>
> -TC_SIE_BV_01_C PASS btmgmt advertising on
> - btmgmt pair -c 0x03 -t 0x01 <addr>
> +TC_SIP_BV_02_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
> +TC_SIE_BV_01_C PASS btmgmt io-cap 0x03
> + btmgmt advertising on
> ---------------------------------------------------------------------------
> ----
I've applied patches 2,3 and 5. Thanks.
But first patch gives me:
fatal: cannot convert from Y to UTF-8
Possibly some encoding issue while sending patch. Could you resend those SM
results?
--
BR
Szymon Janc
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1
2015-05-19 14:45 ` [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1 Szymon Janc
@ 2015-05-20 9:53 ` Skamra Mariusz
0 siblings, 0 replies; 7+ messages in thread
From: Skamra Mariusz @ 2015-05-20 9:53 UTC (permalink / raw)
To: Szymon Janc, Mariusz Skamra; +Cc: linux-bluetooth
Hi Szymon,
On 2015-05-19 16:45, Szymon Janc wrote:
> Hi Mariusz,
>
> On Monday 11 of May 2015 14:49:44 Mariusz Skamra wrote:
>> This patch updates test case results, pics and instructions for
>> SM profile against android 5.1.
>> ---
>> android/pics-sm.txt | 23 ++++++++++++++---------
>> android/pixit-sm.txt | 2 +-
>> android/pts-sm.txt | 38 ++++++++++++--------------------------
>> 3 files changed, 27 insertions(+), 36 deletions(-)
>>
>> diff --git a/android/pics-sm.txt b/android/pics-sm.txt
>> index c5caec6..c31fe76 100644
>> --- a/android/pics-sm.txt
>> +++ b/android/pics-sm.txt
>> @@ -1,8 +1,9 @@
>> SM PICS for the PTS tool.
>>
>> -PTS version: 6.0
>> +PTS version: 6.1
>>
>> * - different than PTS defaults
>> +^ - field not available on PTS
>>
>> M - mandatory
>> O - optional
>> @@ -12,9 +13,11 @@ O - optional
>> Parameter Name Selected Description
>> ---------------------------------------------------------------------------
>> ---- TSPC_SM_1_1 True Master Role (Initiator) (C.1)
>> -TSPC_SM_1_2 True Slave Role (Responder) (C.1)
>> +TSPC_SM_1_2 True Slave Role (Responder) (C.2)
>> ---------------------------------------------------------------------------
>> ---- -C.1: At least one of these features shall be supported.
>> +C.1: Mandatory to support if TSPC_SM_1_2 is NOT supported, otherwise
>> Optional +C.2: Optional IF ((4.0 OR 4.0+HS) AND TSPC_GAP_5_3) OR ((4.1 OR
>> 4.1+HS OR 4.2 + OR 4.2+HS) AND (TSPC_GAP_5_3 OR TSPC_GAP_38_3)))
>> ---------------------------------------------------------------------------
>> ----
>>
>>
>> @@ -26,8 +29,10 @@ TSPC_SM_2_1 True Authenticated MITM protection
> (O)
>> TSPC_SM_2_2 True Unauthenticated no MITM protection (C.1)
>> TSPC_SM_2_3 True No security requirements (M)
>> TSPC_SM_2_4 False (*) OOB supported (O)
>> +TSPC_SM_2_5 (^) LE Secure Connections (C.2)
>> ---------------------------------------------------------------------------
>> ---- C.1: If TSPC_SM_2_1 is supported then Mandatory, else Optional
>> +C.2: Optional IF Core 4.2 OR Core 4.2+HS are supported, otherwise Excluded
>> ---------------------------------------------------------------------------
>> ----
>>
>>
>> @@ -47,8 +52,8 @@ TSPC_SM_4_1 True Just Works (O)
>> TSPC_SM_4_2 True Passkey Entry (C.1)
>> TSPC_SM_4_3 False (*) Out of Band (C.1)
>> ---------------------------------------------------------------------------
>> ---- -C.1: If TSPC_SM_2_1 is supported, at least one of these features shall
>> be - supported.
>> +C.1: Mandatory to support at least one of the defined methods IF
>> TSPC_SM_2_1 is + supported, otherwise Excluded.
>> ---------------------------------------------------------------------------
>> ----
>>
>>
>> @@ -63,7 +68,7 @@ TSPC_SM_5_4 True Slave Initiated Security – Master
>> response(C.2)
>> ---------------------------------------------------------------------------
>> ---- C.1: Mandatory if TSPC_SM_1_2 is supported, otherwise Excluded
>> C.2: Mandatory if TSPC_SM_1_1 is supported, otherwise Excluded
>> -C.3: Mandatory IF TSPC_SM_2_1 OR TSPC_SM_2_1 OR TSPC_SM_2_4 is supported,
>> +C.3: Mandatory IF TSPC_SM_2_1 OR TSPC_SM_2_2 OR TSPC_SM_2_4 is supported,
>> otherwise Excluded
>> ---------------------------------------------------------------------------
>> ----
>>
>> @@ -85,7 +90,7 @@ TSPC_SM_7_1 True Encryption Key (C.1)
>> TSPC_SM_7_2 True Identity Key (C.2)
>> TSPC_SM_7_3 True Signing Key (C.3)
>> ---------------------------------------------------------------------------
>> ---- -C.1: Mandatory if GAP (24/2 OR 42/6) is supported, ELSE Optional
>> -C.2: Mandatory if GAP (26/3) is supported, ELSE Optional
>> -C.3: Mandatory if GAP (25/6 OR 35/6) is supported, ELSE Optional
>> +C.1: Mandatory if TSPC_GAP_24_2 OR TSPC_GAP_42_6 is supported, ELSE
>> Optional +C.2: Mandatory if TSPC_GAP_26_3 is supported, ELSE Optional
>> +C.3: Mandatory if TSPC_GAP_25_6 OR TSPC_GAP_35_6 is supported, ELSE
>> Optional
>> ---------------------------------------------------------------------------
>> ---- diff --git a/android/pixit-sm.txt b/android/pixit-sm.txt
>> index 98e2ab5..6facbb8 100644
>> --- a/android/pixit-sm.txt
>> +++ b/android/pixit-sm.txt
>> @@ -1,6 +1,6 @@
>> SM PIXIT for the PTS tool.
>>
>> -PTS version: 6.0
>> +PTS version: 6.1
>>
>> * - different than PTS defaults
>> & - should be set to IUT Bluetooth address
>> diff --git a/android/pts-sm.txt b/android/pts-sm.txt
>> index 91737cc..9b9e120 100644
>> --- a/android/pts-sm.txt
>> +++ b/android/pts-sm.txt
>> @@ -1,8 +1,8 @@
>> PTS test results for SM
>>
>> -PTS version: 6.0
>> -Tested: 11-February-2015
>> -Android version: 5.0
>> +PTS version: 6.1
>> +Tested: 04-May-2015
>> +Android version: 5.1
>> kernel version: 3.20
>>
>> Results:
>> @@ -24,12 +24,7 @@ TC_JW_BV_02_C PASS btmgmt advertising on
>> TC_JW_BV_05_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
>> TC_JW_BI_01_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
>> TC_JW_BI_02_C PASS btmgmt pairable on
>> -TC_JW_BI_03_C PASS bluetoothd is NOT running
>> - btmgmt power on
>> - btmgmt le on
>> - btmgmt connectable on
>> - btmgmt pairable on
>> - btmgmt discov on
>> +TC_JW_BI_03_C PASS btmgmt pairable on
>> btmgmt advertising on
>> TC_JW_BI_04_C PASS btmgmt pairable off
>> btmgmg pair -c 0x03 -t 0x01 <addr>
>> @@ -38,8 +33,6 @@ TC_PKE_BV_01_C PASS btmgmt pairable off
>> Note: provide passkey to PTS
>> TC_PKE_BV_02_C PASS btmgmt pairable off
>> btmgmt io-cap 0x04
>> - btmgmt advertising on
>> - btmgmt monitor
>> Note: provide passkey
>> TC_PKE_BV_04_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
>> TC_PKE_BV_05_C PASS btmgmt io-cap 0x04
>> @@ -50,7 +43,6 @@ TC_PKE_BI_02_C PASS btmgmt pair -c 0x04 -t 0x01
> <addr>
>> Note: provide passkey
>> TC_PKE_BI_03_C PASS btmgmt io-cap 0x04
>> btmgmt advertising on
>> - btmgmt monitor
>> Note: Enter invalid passkey in PTS
>> TC_OOB_BV_01_C N/A
>> TC_OOB_BV_02_C N/A
>> @@ -59,12 +51,10 @@ TC_OOB_BV_04_C N/A
>> TC_OOB_BV_05_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
>> Note: Enter valid passkey in PTS
>> TC_OOB_BV_06_C PASS btmgmt advertising on
>> - btmgmt monitor
>> Note: Enter valid passkey in PTS
>> TC_OOB_BV_07_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
>> TC_OOB_BV_08_C PASS btmgmt advertising on
>> - btmgmt monitor
>> - Note: Accept pairing in btmgmt monitor
>> + Note: Accept pairing in btmgmt
>> TC_OOB_BV_09_C N/A
>> TC_OOB_BV_10_C N/A
>> TC_OOB_BI_01_C N/A
>> @@ -72,17 +62,15 @@ TC_OOB_BI_02_C N/A
>> TC_EKS_BV_01_C PASS btmgmt pair -c 0x04 -t 0x01 <addr>
>> Note: Enter valid passkey in PTS
>> TC_EKS_BV_02_C PASS btmgmt advertising on
>> - btmgmt monitor
>> - Note: Accept pairing in btmgmt monitor
>> -TC_EKS_BI_01_C PASS btmgmt io-cap 0x03
>> - btmgmt pair -c 0x03 -t 0x01 <addr>
>> + Note: Accept pairing in btmgmt
>> +TC_EKS_BI_01_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
>> TC_EKS_BI_02_C PASS btmgmt advertising on
>> TC_SIGN_BV_01_C INC PTS issue #12305
>> -TC_SIGN_BV_03_C PASS haltest:
>> +TC_SIGN_BV_03_C INC haltest:
>> gattc register_client 1234
>> gattc listen 1 1
>> Note: IUT must be connectable and discoverable
>> -TC_SIGN_BI_01_C PASS haltest:
>> +TC_SIGN_BI_01_C INC haltest:
>> gattc register client 1234
>> gattc listen 1 1
>> Note: IUT must be connectable and discoverable
>> @@ -108,9 +96,7 @@ TC_KDU_BV_05_C PASS PTS issue #12302
>> TC_KDU_BV_06_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
>> TC_KDU_BV_07_C PASS btmgmt pairable on
>> TC_SIP_BV_01_C PASS btmgmt advertising on
>> - btmgmt pair -c 0x03 -t 0x01 <addr>
>> -TC_SIP_BV_02_C PASS btmgmt advertising off
>> - l2test -n -J4 -V le_public <addr>
>> -TC_SIE_BV_01_C PASS btmgmt advertising on
>> - btmgmt pair -c 0x03 -t 0x01 <addr>
>> +TC_SIP_BV_02_C PASS btmgmt pair -c 0x03 -t 0x01 <addr>
>> +TC_SIE_BV_01_C PASS btmgmt io-cap 0x03
>> + btmgmt advertising on
>> ---------------------------------------------------------------------------
>> ----
>
> I've applied patches 2,3 and 5. Thanks.
>
> But first patch gives me:
> fatal: cannot convert from Y to UTF-8
>
> Possibly some encoding issue while sending patch. Could you resend those SM
> results?
>
Yes, sure, I'll send it again.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-05-20 9:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-11 12:49 [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1 Mariusz Skamra
2015-05-11 12:49 ` [PATCH 2/5] shared/att: Add ext_signed flag to be able to use external crypto Mariusz Skamra
2015-05-11 12:49 ` [PATCH 3/5] android/pts: Update GAP test results Mariusz Skamra
2015-05-11 12:49 ` [PATCH 4/5] android/pts: Update SM " Mariusz Skamra
2015-05-11 12:49 ` [PATCH 5/5] android/pts: Update DID " Mariusz Skamra
2015-05-19 14:45 ` [PATCH 1/5] android/pts: Update SM PTS 6.1 results for android 5.1 Szymon Janc
2015-05-20 9:53 ` Skamra Mariusz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).