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.
This commit is contained in:
2026-09-21 22:13:52 +03:00
parent 0446d2a93c
commit f8ba5dea2c
10 changed files with 92 additions and 12 deletions
+10 -1
View File
@@ -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)