Fix critical bugs: undefined variables, function redefinition, syntax errors

Co-authored-by: gusdcoder <[email protected]>

Author: Copilot

extrair_nfc.py

@@ -1,10 +1,11 @@
-from smartcard.System import readers
-from smartcard.util import toHexString, toBytes
 import binascii
 import json
 import os
 import time
 
+from smartcard.System import readers
+from smartcard.util import toHexString, toBytes
+
 def send_apdu(connection, apdu):
     print("APDU:", toHexString(apdu).replace(" ", "").lower())
     data, sw1, sw2 = connection.transmit(apdu)
@@ -111,7 +112,7 @@ def generate_arqc(connection, amount="000000000100"):
     resp, sw1, sw2 = send_apdu(connection, gen_ac_apdu)
     if sw1 != 0x90 or sw2 != 0x00:
         print(f"ARQC failed: SW1={sw1:02X}, SW2={sw2:02X}")
-    return resp, sw1, sw2
+    return resp, sw1, sw2, gen_ac_apdu
 
 def parse_pdol(pdol_str):
     pdol_bytes = toBytes(pdol_str)
@@ -233,7 +234,7 @@ def extractApplication(aid, app_label):
             script = process_afl(connection, afl, script)
 
         # Generate ARQC
-        resp, sw1, sw2 = generate_arqc(connection)
+        resp, sw1, sw2, gen_ac_apdu = generate_arqc(connection)
         script.append({
             "apdu": toHexString(gen_ac_apdu).replace(" ", "").lower(),
             "response": toHexString(resp).replace(" ", "")
@@ -242,7 +243,7 @@ def extractApplication(aid, app_label):
     # Extract data from all responses
     iad = find_tag(parse_tlv(resp), "9F10")
     iad = iad[0] if iad else ""
-    
+
     track2 = None
     country_code = None
     cvm_list = None
@@ -254,7 +255,7 @@ def extractApplication(aid, app_label):
             country_values = find_tag(record_tlv, '5F28')
             cvm_values = find_tag(record_tlv, '8E')
             ctq_values = find_tag(record_tlv, '9F6C')
-            
+
             if track2_values and not track2:
                 track2 = track2_values[0]
             if country_values and not country_code:
@@ -313,4 +314,4 @@ def main():
         extractApplication(aid['aid'], aid['label'])
 
 if __name__ == "__main__":
-    main()
+    main()

extrair_nfc_limpo.py

@@ -1,7 +1,9 @@
-from smartcard.System import readers
-from smartcard.util import toHexString, toBytes
 import binascii
 import json
+import os
+
+from smartcard.System import readers
+from smartcard.util import toHexString, toBytes
 
 def send_apdu(connection, apdu):
     data, sw1, sw2 = connection.transmit(apdu)
@@ -12,15 +14,6 @@ def select_app(connection, aid_hex):
     apdu = [0x00, 0xA4, 0x04, 0x00, len(aid)] + aid + [0x00]
     return send_apdu(connection, apdu)
 
-def get_processing_options(connection, pdol=None):
-    if pdol:
-        pdol_data = toBytes(pdol)
-        gpo_data = [0x83, len(pdol_data)] + pdol_data
-    else:
-        gpo_data = [0x83, 0x00]
-    apdu = [0x80, 0xA8, 0x00, 0x00, len(gpo_data)] + gpo_data + [0x00]
-    return send_apdu(connection, apdu)
-
 def read_record(connection, sfi, record):
     apdu = [0x00, 0xB2, record, (sfi << 3) | 4, 0x00]
     return send_apdu(connection, apdu)
@@ -96,7 +89,7 @@ def process_afl(connection, afl_data, script):
                 print(f"Record {rec:02X} from SFI {sfi:02X}: {toHexString(resp)}")
     return script
 
-def generate_arqc(connection, amount="000000000100", additional_data=""):
+def generate_arqc(connection, amount="000000000100"):
     # Standard EMV ARQC data format
     gen_ac_data = (
         "9F0206" + amount +  # Amount
@@ -120,7 +113,7 @@ def get_processing_options(connection, pdol=None):
     resp, sw1, sw2 = send_apdu(connection, apdu)
     if sw1 != 0x90 or sw2 != 0x00:
         print(f"GPO failed: SW1={sw1:02X}, SW2={sw2:02X}")
-    return resp, sw1, sw2
+    return resp, sw1, sw2, apdu
 
 def main():
     r = readers()
@@ -158,15 +151,10 @@ def main():
 
     tlv = parse_tlv(resp)
     pdol = tlv.get("9F38", None)
-    
+
 
     # Step 3: GPO
-    resp, sw1, sw2 = get_processing_options(connection, pdol)
-    gpo_apdu = [0x80, 0xA8, 0x00, 0x00]
-    if pdol:
-        gpo_apdu += [len(toBytes(pdol)), 0x83, len(toBytes(pdol))] + toBytes(pdol) + [0x00]
-    else:
-        gpo_apdu += [0x02, 0x83, 0x00, 0x00]
+    resp, sw1, sw2, gpo_apdu = get_processing_options(connection, pdol)
     script.append({"apdu": toHexString(gpo_apdu).replace(" ", "").lower(),
                    "response": toHexString(resp).replace(" ", "")})
 
@@ -184,18 +172,18 @@ def main():
         script = process_afl(connection, afl, script)
 
     try:
-    # Generate ARQC
+        # Generate ARQC
         resp, sw1, sw2 = generate_arqc(connection)
         script.append({
             "apdu": toHexString([0x80, 0xAE, 0x80, 0x00]).replace(" ", "").lower(),
             "response": toHexString(resp).replace(" ", "")
         })
-    except:
-        pass
+    except Exception as e:
+        print(f"ARQC generation failed: {e}")
+        resp = []
     iad = parse_tlv(resp).get("9F10", "")
 
     # Extract card data from records
-    app_name = None
     country_code = None
     cvm_list = None
     ctq_data = None
@@ -205,15 +193,15 @@ def main():
             record_tlv = parse_tlv(bytes.fromhex(record['response']))
             if '70' in record_tlv:
                 record_data = record_tlv['70']
-                
+
                 # Country code (tag 5F28)
                 if '5F28' in record_data:
                     country_code = record_data['5F28']
-                
+
                 # CVM List (tag 8E)
                 if '8E' in record_data:
                     cvm_list = record_data['8E']
-                
+
                 # Card Transaction Qualifiers (tag 9F6C)
                 if '9F6C' in record_data:
                     ctq_data = record_data['9F6C']
@@ -224,7 +212,6 @@ def main():
 
 
     # Create dumps directory if it doesn't exist
-    import os
     if not os.path.exists('dumps'):
         os.makedirs('dumps')
 
@@ -239,9 +226,9 @@ def main():
         except Exception as e:
             print(f"Error parsing record: {e}")
             continue
-    
+
     output = {
-        "name": f"{app_label}_{track2[:6]}]",
+        "name": f"{app_label}_{track2[:6]}",
         "appName": app_label,
         "aid": aid,
         "pdol": pdol.lower() if pdol else None,
@@ -255,13 +242,13 @@ def main():
     # Generate filename
     filename = f"{track2 or 'notrack2'}_{aid}.json"
     filepath = os.path.join('dumps', filename)
-    
+
     # Save to file
     with open(filepath, 'w') as f:
         f.write(json.dumps(output, indent=4, ensure_ascii=False))
-    
+
     print(f"Output saved to: {filepath}")
     print(json.dumps(output, indent=4, ensure_ascii=False))
 
 if __name__ == "__main__":
-    main()
+    main()