Change in pysim[master]: proactive: Avoid clobbering the output of the command that triggered ...

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/29066 ) Change subject: proactive: Avoid clobbering the output of the command that triggered the FETCH ...................................................................... proactive: Avoid clobbering the output of the command that triggered the FETCH Change-Id: I2b794a5c5bc808b9703b4bc679c119341a0ed41c --- M pySim/transport/__init__.py 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 04e6b22..fb04209 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -160,13 +160,18 @@ sw : string (in hex) of status word (ex. "9000") """ rv = self.send_apdu(pdu) + last_sw = rv[1] - while sw == '9000' and sw_match(rv[1], '91xx'): + while sw == '9000' and sw_match(last_sw, '91xx'): + # It *was* successful after all -- the extra pieces FETCH handled + # need not concern the caller. + rv = (rv[0], '9000') # proactive sim as per TS 102 221 Setion 7.4.2 - rv = self.send_apdu_checksw('80120000' + rv[1][2:], sw) - print("FETCH: %s" % rv[0]) + fetch_rv = self.send_apdu_checksw('80120000' + last_sw[2:], sw) + last_sw = fetch_rv[1] + print("FETCH: %s" % fetch_rv[0]) if self.proactive_handler: - self.proactive_handler.receive_fetch_raw(rv[0]) + self.proactive_handler.receive_fetch_raw(fetch_rv[0]) if not sw_match(rv[1], sw): raise SwMatchError(rv[1], sw.lower(), self.sw_interpreter) return rv -- To view, visit https://gerrit.osmocom.org/c/pysim/+/29066 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2b794a5c5bc808b9703b4bc679c119341a0ed41c Gerrit-Change-Number: 29066 Gerrit-PatchSet: 2 Gerrit-Owner: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged