Abstract out command class

henryk · Oct 18, 2010 · 144efe1 · 144efe1
1 parent e343352
commit 144efe1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/cards/iso_card.py b/cards/iso_card.py
@@ -6,6 +6,7 @@
 class ISO_Card(Card):
     DRIVER_NAME = ["ISO"]
     COMMAND_GET_RESPONSE = C_APDU(ins=0xc0)
+    COMMAND_CLASS = C_APDU
 
     APDU_VERIFY_PIN = C_APDU(ins=0x20)
 

diff --git a/cyberflex-shell.py b/cyberflex-shell.py
@@ -230,10 +230,13 @@ def _clear_sw(self):
         self.card.last_delta = None
 
     def do_fancy_apdu(self, *args):
-        "Parse and transmit a fancy APDU"
+        "Parse and transmit a fancy command"
         apdu = None
         try:
-            apdu = utils.C_APDU.parse_fancy(*args)
+            if hasattr(self.card.COMMAND_CLASS, "parse_fancy"):
+                apdu = self.card.COMMAND_CLASS.parse_fancy(*args)
+            else:
+                apdu = self.card.COMMAND_CLASS(*args)
         except ValueError:
             raise NotImplementedError
 

diff --git a/utils.py b/utils.py
@@ -228,6 +228,11 @@ def __repr__(self):
     # Stub for implementation in subclasses
     # Semantics should be: c=a.append(b) <=> c.data == a.data + b.data and c.status == b.status
     append = None
+
+    @classmethod
+    def parse_fancy(cls, *args):
+        argstring = "".join((" ".join(args)).split())
+        return cls(binascii.unhexlify(argstring))
 
 class Command_Frame(Transmission_Frame):
     pass