laforge submitted this change.

View Change


Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified
SJA5: Add TUAK + XOR-2G algorithm definitions for EF_[U]SIM_AUTH_KEY

Change-Id: I62a7255d991fa1ed09a7c9bcf8be4b68acfa61a7
---
M pySim/sysmocom_sja2.py
1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py
index 20504a7..d1f643e 100644
--- a/pySim/sysmocom_sja2.py
+++ b/pySim/sysmocom_sja2.py
@@ -186,7 +186,7 @@
CfgByte = BitStruct(Padding(1), 'only_4bytes_res_in_3g'/Bit,
'use_sres_deriv_func_2_in_3g'/Bit,
'use_opc_instead_of_op'/Bit,
- 'algorithm'/Enum(Nibble, milenage=4, sha1_aka=5, xor=15))
+ 'algorithm'/Enum(Nibble, milenage=4, sha1_aka=5, tuak=6, xor=15))
self._construct = Struct('cfg'/CfgByte,
'key'/HexAdapter(Bytes(16)),
'op_opc' /HexAdapter(Bytes(16)))
@@ -198,7 +198,7 @@
CfgByte = BitStruct(Padding(1), 'only_4bytes_res_in_3g'/Bit,
'use_sres_deriv_func_2_in_3g'/Bit,
'use_opc_instead_of_op'/Bit,
- 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3))
+ 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3, xor=14))
self._construct = Struct('cfg'/CfgByte,
'key'/HexAdapter(Bytes(16)),
'op_opc' /HexAdapter(Bytes(16)))

To view, visit change 33077. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I62a7255d991fa1ed09a7c9bcf8be4b68acfa61a7
Gerrit-Change-Number: 33077
Gerrit-PatchSet: 3
Gerrit-Owner: laforge <laforge@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-MessageType: merged