From 958f0384dbb11930930b8e9dbd8dfa004204a253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ams=C3=BCss?= Date: Fri, 19 Aug 2022 20:18:07 +0200 Subject: [PATCH 1/2] OTA: Set PCNT (padding count) in messages Change-Id: Ia3cb4222ebe7f8922c96509a94cf126db3dea14c --- pySim/ota.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pySim/ota.py b/pySim/ota.py index c2b475eb..31b5040d 100644 --- a/pySim/ota.py +++ b/pySim/ota.py @@ -344,7 +344,9 @@ class OtaDialectSms(OtaDialect): if spi['ciphering']: # ciphering is requested # append padding bytes to end up with blocksize len_cipher = 6 + len_sig + len(apdu) - apdu += otak.crypt._get_padding(len_cipher, otak.crypt.blocksize) + padding = otak.crypt._get_padding(len_cipher, otak.crypt.blocksize) + pad_cnt = len(padding) + apdu += padding kic = {'key': otak.kic_idx, 'algo': otak.algo_crypt} kid = {'key': otak.kid_idx, 'algo': otak.algo_auth} From fd290f97937941cca6243a19078a1a12bcb6121a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ams=C3=BCss?= Date: Thu, 18 Aug 2022 09:13:16 +0200 Subject: [PATCH 2/2] SMS: UserDataHeader's __str__ is also a suitable __repr__ Change-Id: I59cc04e8700a374b440f192080b5c5baad60a235 --- pySim/sms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pySim/sms.py b/pySim/sms.py index a953ba6e..a2812131 100644 --- a/pySim/sms.py +++ b/pySim/sms.py @@ -36,8 +36,8 @@ class UserDataHeader: def __init__(self, ies=[]): self.ies = ies - def __str__(self) -> str: - return 'UDH(%s)' % self.ies + def __repr__(self) -> str: + return 'UDH(%r)' % self.ies def has_ie(self, iei:int) -> bool: for ie in self.ies: