fix: use the card's own SimCardCommands for ADM and AUTHENTICATE (v2.7.20)

/api/verify-adm sent VERIFY with CLA A0 on a UICC (SW 6E00) while
pySim-shell's verify_adm worked: fast init builds the card on its own
SimCardCommands instance, but __main__ kept server.scc at the startup
placeholder left at the SIM defaults; only an equip repointed it.

- __main__ adopts card._scc after init (cat_cla still set on it), so
  server.scc carries the card's cla_byte/sel_ctrl from startup on.
- _verify_adm prefers app.rs.lchan[0].scc / app.card._scc, exactly like
  pySim-shell's verify_adm, independent of server.scc.
- netsim AUTHENTICATE follows the card class: a UICC gets 00 88 00 81 22
  (RAND+AUTN, DB/DC response), a SIM gets A0 88 00 00 10 (RAND only,
  SRES+Kc); the 61xx GET RESPONSE uses the same CLA.
- tests: ADM with a stale placeholder scc; 2G builder/parser; SIM-CLA
  runner case; help EN/RU and AGENTS updated.

pysim_simple_server/__main__.py

@@ -138,6 +138,11 @@ def main():
                 sys.stderr.write('INIT: no card in the reader — server ready; insert a card or press Equip\n')
         _tlog('card_init: %.0fms' % ((time.time() - t_phase) * 1000))
         if card is not None:
+            # Fast init builds the card on its own SimCardCommands instance;
+            # adopt it so server.scc carries the card's cla_byte/sel_ctrl (the
+            # placeholder created above is a different object left at the SIM
+            # defaults, which made VERIFY go out with CLA A0 on a UICC).
+            scc = card._scc
             scc.cat_cla = '80' if isinstance(card, UiccCardBase) else 'a0'
     except Exception:
         print("Warning: reader/card initialization failed:", file=sys.stderr)

pysim_simple_server/netsim.py

@@ -336,15 +336,30 @@ def build_auth_apdu(rand_hex, autn_hex, cla='00'):
     rand = bytes.fromhex(_norm_hex(rand_hex, 16))
     autn = bytes.fromhex(_norm_hex(autn_hex, 16))
     body = bytes([len(rand)]) + rand + bytes([len(autn)]) + autn
-    return '%s880081%02X%s' % (cla, len(body), body.hex().upper())
+    return '%s880081%02X%s' % (cla.upper(), len(body), body.hex().upper())
 
 
-def parse_auth_response(data_hex):
-    """Parse the AUTHENTICATE response: DB (success) or DC (sync failure)."""
+def build_auth_apdu_gsm(rand_hex, cla='a0'):
+    """2G AUTHENTICATE (GSM 11.11 8.8): P1/P2 00, Lc 0x10, RAND only.
+
+    The response is SRES (4 B) followed by Kc (8 B).
+    """
+    rand = bytes.fromhex(_norm_hex(rand_hex, 16))
+    return '%s88000010%s' % (cla.upper(), rand.hex().upper())
+
+
+def parse_auth_response(data_hex, gsm=False):
+    """Parse the AUTHENTICATE response: DB (success) or DC (sync failure) for
+    3G/EPS/5G, SRES||Kc for the 2G SIM command."""
     try:
         data = bytes.fromhex(_norm_hex(data_hex or ''))
     except ValueError:
         return None
+    if gsm:
+        if len(data) < 12:
+            return None
+        return {'type': 'gsm', 'sres': data[0:4].hex().upper(),
+                'kc': data[4:12].hex().upper()}
     if not data or data[0] not in (0xDB, 0xDC):
         return None
     out = {'type': 'success' if data[0] == 0xDB else 'synchronisation_failure'}
@@ -815,11 +830,17 @@ class NetSimRunner:
         autn = self.p('autn') or rand_hex(16)
         if not self.scc:
             raise StepError('card session not available')
-        apdu = build_auth_apdu(rand, autn)
+        # The command follows the card's class: a UICC gets the 3G/EPS/5G
+        # AUTHENTICATE (P2 81, RAND + AUTN), a SIM the 2G one (P1/P2 00,
+        # RAND only, SRES + Kc in the response).
+        cla = (getattr(self.scc, 'cla_byte', None) or '00').upper()
+        gsm = cla == 'A0'
+        apdu = (build_auth_apdu_gsm(rand, cla) if gsm
+                else build_auth_apdu(rand, autn, cla))
         data, sw = self.scc._tp.send_apdu(apdu)
         if sw.startswith('61'):
-            data, sw = self.scc._tp.send_apdu('00C00000' + sw[2:4])
-        parsed = parse_auth_response(data)
+            data, sw = self.scc._tp.send_apdu(cla + 'C00000' + sw[2:4])
+        parsed = parse_auth_response(data, gsm=gsm)
         self._add('authenticate', data=apdu, response=(data or '').upper(),
                   parsed=parsed, sw=sw, ok=True)
 

pysim_simple_server/server.py

@@ -26,7 +26,7 @@ from osmocom.tlv import BER_TLV_IE
 from osmocom.utils import rpad
 
 
-VERSION = '2.7.19'
+VERSION = '2.7.20'
 
 MAX_ENVELOPE_SEGMENTS = 5  # max SMS segments for outgoing C-APDU in ENVELOPE
 
@@ -2698,6 +2698,15 @@ def _verify_adm(scc, app, adm_hex):
     remaining attempts: every failed VERIFY consumes one, and a blocked ADM
     cannot be recovered from here (it needs the unblock key).
     """
+    # Use the card's own logical channel, exactly like pySim-shell's
+    # verify_adm.  server.scc can still be the startup placeholder (SIM CLA)
+    # when no equip has happened yet, and a UICC then answers 6E00.
+    rs = getattr(app, 'rs', None)
+    lchan = rs.lchan[0] if rs is not None and getattr(rs, 'lchan', None) else None
+    card_scc = (getattr(lchan, 'scc', None)
+                or getattr(getattr(app, 'card', None), '_scc', None))
+    if card_scc is not None:
+        scc = card_scc
     chv = getattr(getattr(app, 'card', None), '_adm_chv_num', 0x0A)
     fc = rpad(str(adm_hex).lower(), 16)
     _data, sw = scc.send_apdu(scc.cla_byte + '2000' + ('%02X' % chv) + '08' + fc)