Skip to content

Commit 5708641

Browse files
puddlypuddly
committed
Test network with both hashed and unhashed unique link keys
1 parent c63ff22 commit 5708641

File tree

4 files changed

+39
-37
lines changed

4 files changed

+39
-37
lines changed

‎tests/application/test_startup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"CC13X2/CC26X2, Z-Stack 3.30.00/3.40.00/4.10.00",
2525
15,
2626
t.Channels.from_channel_list([15]),
27-
0x9B21,
28-
t.EUI64.convert("f4:4b:c6:c8:d6:12:2e:8f"),
29-
t.KeyData(bytes.fromhex("121ec4cce6d6ad81c822b8e2bf707227")),
27+
0x4402,
28+
t.EUI64.convert("a2:ba:38:a8:b5:e6:83:a0"),
29+
t.KeyData(bytes.fromhex("4c4e72b8412251799abf35251288ca83")),
3030
),
3131
FormedZStack3CC2531: (
3232
"CC2531, Z-Stack 3.0.1/3.0.2",

‎tests/nvram/CC2652R-ZStack4.formed.json

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
"EXTADDR": "a8ef171e004b1200",
55
"STARTUP_OPTION": "00",
66
"START_DELAY": "0a",
7-
"NIB": "000502330f33001e0000000105018f000700020d1e0000000f0000000000000000000000219b0800008000000f0f04000100000001000000008f2e12d6c8c64bf4010000000000000000000000000000000000000000000000000000000000000000000000000f050001780a010000006e010000",
7+
"NIB": "600502330f33001e0000000105018f000700020d1e0000000f000000000000000000000002440800008000000f0f0400010000000100000000a083e6b5a838baa2010000000000000000000000000000000000000000000000000000000000000000000000000f050001780a0100000000000000",
88
"POLL_RATE_OLD16": "0000",
99
"DATA_RETRIES": "02",
1010
"POLL_FAILURE_RETRIES": "03",
1111
"STACK_PROFILE": "02",
1212
"INDIRECT_MSG_TIMEOUT": "07",
1313
"ROUTE_EXPIRY_TIME": "1e",
14-
"EXTENDED_PAN_ID": "a8ef171e004b1200",
14+
"EXTENDED_PAN_ID": "a083e6b5a838baa2",
1515
"BCAST_RETRIES": "02",
1616
"PASSIVE_ACK_TIMEOUT": "05",
1717
"BCAST_DELIVERY_TIME": "1e",
@@ -23,8 +23,8 @@
2323
"NWK_MGR_MODE": "01",
2424
"SRC_RTG_EXPIRY_TIME": "ff",
2525
"ROUTE_DISCOVERY_TIME": "0d",
26-
"NWK_ACTIVE_KEY_INFO": "00121ec4cce6d6ad81c822b8e2bf707227",
27-
"NWK_ALTERN_KEY_INFO": "00121ec4cce6d6ad81c822b8e2bf707227",
26+
"NWK_ACTIVE_KEY_INFO": "004c4e72b8412251799abf35251288ca83",
27+
"NWK_ALTERN_KEY_INFO": "004c4e72b8412251799abf35251288ca83",
2828
"ROUTER_OFF_ASSOC_CLEANUP": "01",
2929
"NWK_LEAVE_REQ_ALLOWED": "01",
3030
"NWK_CHILD_AGE_ENABLE": "00",
@@ -33,11 +33,11 @@
3333
"APS_ACK_WAIT_DURATION": "f401",
3434
"APS_ACK_WAIT_MULTIPLIER": "02",
3535
"BINDING_TIME": "803e",
36-
"APS_USE_EXT_PANID": "8f2e12d6c8c64bf4",
36+
"APS_USE_EXT_PANID": "a083e6b5a838baa2",
3737
"APS_USE_INSECURE_JOIN": "01",
3838
"COMMISSIONED_NWK_ADDR": "feff",
3939
"APS_NONMEMBER_RADIUS": "02",
40-
"APS_LINK_KEY_TABLE": "0000000000000000000000000000000000000000",
40+
"APS_LINK_KEY_TABLE": "02000000000001ff0500010001ff000000000000",
4141
"APS_DUPREJ_TIMEOUT_INC": "e803",
4242
"APS_DUPREJ_TIMEOUT_COUNT": "0a",
4343
"APS_DUPREJ_TABLE_SIZE": "0500",
@@ -46,34 +46,34 @@
4646
"END_DEV_TIMEOUT_VALUE": "08",
4747
"END_DEV_CONFIGURATION": "00",
4848
"BDBNODEISONANETWORK": "01",
49-
"PRECFGKEY": "121ec4cce6d6ad81c822b8e2bf707227",
50-
"PRECFGKEYS_ENABLE": "01",
49+
"PRECFGKEY": "4c4e72b8412251799abf35251288ca83",
50+
"PRECFGKEYS_ENABLE": "00",
5151
"SECURE_PERMIT_JOIN": "01",
5252
"APS_LINK_KEY_TYPE": "01",
5353
"APS_ALLOW_R19_SECURITY": "00",
5454
"USE_DEFAULT_TCLK": "01",
5555
"TRUSTCENTER_ADDR": "0000000000000000",
5656
"USERDESC": "0000000000000000000000000000000000",
57-
"NWKKEY": "00121ec4cce6d6ad81c822b8e2bf70722700000000000000",
58-
"PANID": "219b",
57+
"NWKKEY": "004c4e72b8412251799abf35251288ca83ffffff4c1d0000",
58+
"PANID": "0244",
5959
"CHANLIST": "00800000",
6060
"LEAVE_CTRL": "00",
6161
"SCAN_DURATION": "04",
6262
"LOGICAL_TYPE": "00",
6363
"NWKMGR_MIN_TX": "00",
6464
"ZDO_DIRECT_CB": "01",
6565
"SAPI_ENDPOINT": "e0",
66-
"TCLK_SEED": "9e8eab68b391f517b05b5ecb105b2bfe"
66+
"TCLK_SEED": "c04884427c8a1ed7bb8412815ccce7aa"
6767
},
6868
"ADDRMGR": {
69-
"0x0000": "03ff8f73a4412ffeffbd1bec",
70-
"0x0001": "03ffe74b59214b1c004b1200",
71-
"0x0002": "02ff93fef23acefeff5ecfd0",
72-
"0x0003": "03ff7a4d8e6e4b1c004b1200",
73-
"0x0004": "ffffffffffffffffffffffff",
74-
"0x0005": "ffffffffffffffffffffffff",
75-
"0x0006": "ffffffffffffffffffffffff",
76-
"0x0007": "ffffffffffffffffffffffff",
69+
"0x0000": "02ff4b6657d42bfeff570b00",
70+
"0x0001": "01ff120031a259214b1c004b",
71+
"0x0002": "02ff9796ddbb2bfeff9ffd90",
72+
"0x0003": "02ff6bc50b9a32feff9ffd90",
73+
"0x0004": "02ff7c4c2ac0eefeffcccccc",
74+
"0x0005": "02ff158ff23acefeff5ecfd0",
75+
"0x0006": "02ffc022bb9bdafeff5ecfd0",
76+
"0x0007": "02ff1c6d404f54feffbd1bec",
7777
"0x0008": "ffffffffffffffffffffffff",
7878
"0x0009": "ffffffffffffffffffffffff",
7979
"0x000A": "ffffffffffffffffffffffff",
@@ -328,9 +328,9 @@
328328
"0x0000": "ffffffffffffffffffffffffffff"
329329
},
330330
"DEVICE_LIST": {
331-
"0x0000": "8f73000004080001ff310020feffffff",
332-
"0x0001": "e74b010001680100ff310020003c0000",
333-
"0x0002": "7a4d030001680100ff310020003c0000",
331+
"0x0000": "ffffffffffffffffffffffffffffffff",
332+
"0x0001": "ffffffffffffffffffffffffffffffff",
333+
"0x0002": "ffffffffffffffffffffffffffffffff",
334334
"0x0003": "ffffffffffffffffffffffffffffffff",
335335
"0x0004": "ffffffffffffffffffffffffffffffff",
336336
"0x0005": "ffffffffffffffffffffffffffffffff",
@@ -381,11 +381,11 @@
381381
"0x0032": "ffffffffffffffffffffffffffffffff"
382382
},
383383
"TCLK_TABLE": {
384-
"0x0000": "00000000000000000000000000000000ff000000",
385-
"0x0001": "00000000000000000000000000000000ff000000",
386-
"0x0002": "00000000000000000000000000000000ff000000",
387-
"0x0003": "00000000000000000000000000000000ff000000",
388-
"0x0004": "00000000000000000000000000000000ff000000",
384+
"0x0000": "c35b000035340000ddbb2bfeff9ffd9002000e00",
385+
"0x0001": "fe330000050100000b9a32feff9ffd9002000d00",
386+
"0x0002": "89540000dde200002ac0eefeffcccccc02000000",
387+
"0x0003": "e0330000f7000000bb9bdafeff5ecfd002000800",
388+
"0x0004": "6059000006380100404f54feffbd1bec02000000",
389389
"0x0005": "00000000000000000000000000000000ff000000",
390390
"0x0006": "00000000000000000000000000000000ff000000",
391391
"0x0007": "00000000000000000000000000000000ff000000",
@@ -579,19 +579,19 @@
579579
"0x00C3": "00000000000000000000000000000000ff000000",
580580
"0x00C4": "00000000000000000000000000000000ff000000",
581581
"0x00C5": "00000000000000000000000000000000ff000000",
582-
"0x00C6": "6300000000000000f23acefeff5ecfd002000d00",
583-
"0x00C7": "2100000000000000a4412ffeffbd1bec02000000"
582+
"0x00C6": "00000000000000000000000000000000ff000000",
583+
"0x00C7": "00000000000000000000000000000000ff000000"
584584
},
585585
"APS_KEY_DATA_TABLE": {
586-
"0x0000": "000000000000000000000000000000000000000000000000",
587-
"0x0001": "000000000000000000000000000000000000000000000000",
586+
"0x0000": "6822d93c39c7d86085d999879e3fd7f46f1b000007000000",
587+
"0x0001": "92e8c34c863fa70c0605380c3d985f039017000012000000",
588588
"0x0002": "000000000000000000000000000000000000000000000000"
589589
},
590590
"NWK_SEC_MATERIAL_TABLE": {
591-
"0x0000": "6a1800008f2e12d6c8c64bf4",
591+
"0x0000": "4c1d0000a083e6b5a838baa2",
592592
"0x0001": "000000000000000000000000",
593593
"0x0002": "000000000000000000000000",
594594
"0x0003": "000000000000000000000000",
595595
"0x0004": "000000000000000000000000"
596596
}
597-
}
597+
}

‎zigpy_znp/types/structs.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ class KeyAttributes(basic.enum_uint8):
160160

161161

162162
class TCLKDevEntry(cstruct.CStruct):
163+
_padding_byte = b"\x00"
164+
163165
txFrmCntr: basic.uint32_t
164166
rxFrmCntr: basic.uint32_t
165167

‎zigpy_znp/znp/security.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ async def write_devices(
470470
txFrmCntr=0,
471471
rxFrmCntr=0,
472472
extAddr=t.EUI64.convert("00:00:00:00:00:00:00:00"),
473-
keyAttributes=t.KeyAttributes.PROVISIONAL_KEY,
473+
keyAttributes=t.KeyAttributes.DEFAULT_KEY,
474474
keyType=t.KeyType.NONE,
475475
SeedShift_IcIndex=0,
476476
)

0 commit comments

Comments
 (0)