Upgrade bluez5_37 :Merge the code from private

[platform/upstream/bluez.git] / android / pics-sm.txt

diff --git a/android/pics-sm.txt b/android/pics-sm.txt
old mode 100644 (file)
new mode 100755 (executable)
index c5caec6..c31fe76
--- 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
 -------------------------------------------------------------------------------