dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/39056?usp=email )
Change subject: ara_m: put hex string values in quotes ...................................................................... ara_m: put hex string values in quotes When we export data from the ara-m applet a commandline is printed to the exported script file. This commandline contains hexs trings. Let's put those hex-strings in quotes. Related: OS#6681 Change-Id: Ia365e83638ff4f1b1a02e1671852cf2006f80c7f --- M pySim/ara_m.py M tests/pySim-shell_test/ara_m/adf_ara-m.script.ok M tests/pySim-shell_test/ara_m/test.script 3 files changed, 14 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/56/39056/1 diff --git a/pySim/ara_m.py b/pySim/ara_m.py index f4da31d..63838b2 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -448,24 +448,26 @@ # Write command-line export_str += "aram_store_ref_ar_do" if aid_ref_do: - export_str += (" --aid %s" % aid_ref_do) + export_str += (" --aid \"%s\"" % aid_ref_do) else: export_str += " --aid-empty" if dev_app_id_ref_do: - export_str += (" --device-app-id %s" % dev_app_id_ref_do) + export_str += (" --device-app-id \"%s\"" % dev_app_id_ref_do) if apdu_ar_do and 'generic_access_rule' in apdu_ar_do: export_str += (" --apdu-%s" % apdu_ar_do['generic_access_rule']) elif apdu_ar_do and 'apdu_filter' in apdu_ar_do: export_str += (" --apdu-filter ") + export_str += "\"" for apdu_filter in apdu_ar_do['apdu_filter']: export_str += apdu_filter['header'] export_str += apdu_filter['mask'] + export_str += "\"" if nfc_ar_do and 'nfc_event_access_rule' in nfc_ar_do: export_str += (" --nfc-%s" % nfc_ar_do['nfc_event_access_rule']) if perm_ar_do: - export_str += (" --android-permissions %s" % perm_ar_do['permissions']) + export_str += (" --android-permissions \"%s\"" % perm_ar_do['permissions']) if pkg_ref_do: - export_str += (" --pkg-ref %s" % pkg_ref_do['package_name_string']) + export_str += (" --pkg-ref \"%s\"" % pkg_ref_do['package_name_string']) export_str += "\n" return export_str diff --git a/tests/pySim-shell_test/ara_m/adf_ara-m.script.ok b/tests/pySim-shell_test/ara_m/adf_ara-m.script.ok index 79c20eb..814bb17 100644 --- a/tests/pySim-shell_test/ara_m/adf_ara-m.script.ok +++ b/tests/pySim-shell_test/ara_m/adf_ara-m.script.ok @@ -7,10 +7,10 @@ # Decoded FCP Template: None select MF/ADF.ARA-M aram_delete_all -aram_store_ref_ar_do --aid ffffffffffdd --device-app-id a1234567890123bb1f140de987aaa891bbbf0bdd --apdu-filter aabbccdd010203041122334405060708 --nfc-never --android-permissions 0000000000000004 -aram_store_ref_ar_do --aid ffffffffffcc --device-app-id a1234567890aaabb1f140de987657891a04f0bdd --apdu-filter aabbccdd01020304 --nfc-always --android-permissions 0000000000000004 -aram_store_ref_ar_do --aid ffffffffffbb --device-app-id aa6872f28b340b2345678905d5c2bbd5a04f0bdd --apdu-always --nfc-always --android-permissions 0000000000000004 -aram_store_ref_ar_do --aid ffffffffffaa --device-app-id aa6872787654334567840de535c2bbd5a04f0baa --apdu-never --nfc-never --android-permissions 0000000000000004 +aram_store_ref_ar_do --aid "ffffffffffdd" --device-app-id "a1234567890123bb1f140de987aaa891bbbf0bdd" --apdu-filter "aabbccdd010203041122334405060708" --nfc-never --android-permissions "0000000000000004" +aram_store_ref_ar_do --aid "ffffffffffcc" --device-app-id "a1234567890aaabb1f140de987657891a04f0bdd" --apdu-filter "aabbccdd01020304" --nfc-always --android-permissions "0000000000000004" +aram_store_ref_ar_do --aid "ffffffffffbb" --device-app-id "aa6872f28b340b2345678905d5c2bbd5a04f0bdd" --apdu-always --nfc-always --android-permissions "0000000000000004" +aram_store_ref_ar_do --aid "ffffffffffaa" --device-app-id "aa6872787654334567840de535c2bbd5a04f0baa" --apdu-never --nfc-never --android-permissions "0000000000000004" # ################################################################################ # Export summary # diff --git a/tests/pySim-shell_test/ara_m/test.script b/tests/pySim-shell_test/ara_m/test.script index e6db749..a3c6399 100644 --- a/tests/pySim-shell_test/ara_m/test.script +++ b/tests/pySim-shell_test/ara_m/test.script @@ -7,10 +7,10 @@ # Create a known config in ADF.ARA-M select ADF.ARA-M aram_delete_all -aram_store_ref_ar_do --aid ffffffffffaa --device-app-id aa6872787654334567840de535c2bbd5a04f0baa --apdu-never --nfc-never --android-permissions 0000000000000004 -aram_store_ref_ar_do --aid ffffffffffbb --device-app-id aa6872f28b340b2345678905d5c2bbd5a04f0bdd --apdu-always --nfc-always --android-permissions 0000000000000004 -aram_store_ref_ar_do --aid ffffffffffcc --device-app-id a1234567890aaabb1f140de987657891a04f0bdd --apdu-filter aabbccdd01020304 --nfc-always --android-permissions 0000000000000004 -aram_store_ref_ar_do --aid ffffffffffdd --device-app-id a1234567890123bb1f140de987aaa891bbbf0bdd --apdu-filter aabbccdd010203041122334405060708 --nfc-never --android-permissions 0000000000000004 +aram_store_ref_ar_do --aid "ffffffffffaa" --device-app-id "aa6872787654334567840de535c2bbd5a04f0baa" --apdu-never --nfc-never --android-permissions "0000000000000004" +aram_store_ref_ar_do --aid "ffffffffffbb" --device-app-id "aa6872f28b340b2345678905d5c2bbd5a04f0bdd" --apdu-always --nfc-always --android-permissions "0000000000000004" +aram_store_ref_ar_do --aid "ffffffffffcc" --device-app-id "a1234567890aaabb1f140de987657891a04f0bdd" --apdu-filter "aabbccdd01020304" --nfc-always --android-permissions "0000000000000004" +aram_store_ref_ar_do --aid "ffffffffffdd" --device-app-id "a1234567890123bb1f140de987aaa891bbbf0bdd" --apdu-filter "aabbccdd010203041122334405060708" --nfc-never --android-permissions "0000000000000004" # Export ADF.ARA-M to a temporary script file export --filename ADF.ARA-M > adf_ara-m.script.tmp -- To view, visit https://gerrit.osmocom.org/c/pysim/+/39056?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia365e83638ff4f1b1a02e1671852cf2006f80c7f Gerrit-Change-Number: 39056 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pma...@sysmocom.de>