laforge submitted this change.

View Change


Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved
global_platform: Correctly decode Key Information Data

The list contains tuples of (key_type, key_length). Let's fix that.

Change-Id: Icf367827d62ed67afa27ee3d0ba9d5cd5bc65c99
---
M pySim/global_platform.py
1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pySim/global_platform.py b/pySim/global_platform.py
index 136cccc..b564770 100644
--- a/pySim/global_platform.py
+++ b/pySim/global_platform.py
@@ -95,8 +95,9 @@
# c0 04 02038010
# c0 04 03038010
class KeyInformationData(BER_TLV_IE, tag=0xc0):
+ KeyTypeLen = Struct('type'/KeyType, 'length'/Int8ub)
_construct = Struct('key_identifier'/Byte, 'key_version_number'/Byte,
- 'key_types'/GreedyRange(KeyType))
+ 'key_types'/GreedyRange(KeyTypeLen))
class KeyInformation(BER_TLV_IE, tag=0xe0, nested=[KeyInformationData]):
pass


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

Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Icf367827d62ed67afa27ee3d0ba9d5cd5bc65c99
Gerrit-Change-Number: 35448
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-MessageType: merged