From 264d9bf284567bf4f1878ae8778f1f3fbb8c98c1 Mon Sep 17 00:00:00 2001 From: Antiklesys Date: Sat, 5 Sep 2026 17:16:38 +0800 Subject: [PATCH] TA1=96 support for SIM module --- armsrc/i2c.c | 10 +++++----- armsrc/i2c.h | 6 +++--- armsrc/sam_sc.c | 2 +- client/resources/sim024.bin | Bin 0 -> 7940 bytes client/resources/sim024.sha512.txt | 1 + 5 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 client/resources/sim024.bin create mode 100644 client/resources/sim024.sha512.txt diff --git a/armsrc/i2c.c b/armsrc/i2c.c index f8498e972..52d1a64b4 100644 --- a/armsrc/i2c.c +++ b/armsrc/i2c.c @@ -65,7 +65,7 @@ static bool s_proto_announced = false; // keep the T=0 they had before. static uint8_t s_pps_proto_cmd = 0; -#if SAM_SC_FORCE_T1_TA1_95 +#if SAM_SC_FORCE_T1_PROFILE // One-shot request used by the SAM secure-channel path. Keep it separate // from generic SmartCardRaw PPS selection so the performance policy does not // alter unrelated contact-card commands. @@ -1138,7 +1138,7 @@ static bool sc_pps(uint8_t proto, uint8_t ta1) { return false; } // resp is [ok][active protocol][ta1 in force] - if ((resp[0] != 1) || (resp[2] != ta1)) { + if ((resp[0] != 1) || (resp[1] != (proto & 0x0F)) || (resp[2] != ta1)) { return false; } @@ -1162,7 +1162,7 @@ uint8_t sc_active_device_cmd(void) { } void sc_request_sam_t1_profile(void) { -#if SAM_SC_FORCE_T1_TA1_95 +#if SAM_SC_FORCE_T1_PROFILE s_sam_t1_profile_requested = true; #endif } @@ -1241,7 +1241,7 @@ bool GetATR(smart_card_atr_t *card_ptr, bool verbose) { s_card_protocols = atr_protocols(card_ptr->atr, card_ptr->atr_len); s_proto_announced = false; -#if SAM_SC_FORCE_T1_TA1_95 +#if SAM_SC_FORCE_T1_PROFILE const bool request_sam_t1 = s_sam_t1_profile_requested; s_sam_t1_profile_requested = false; if (request_sam_t1) { @@ -1300,7 +1300,7 @@ bool GetATR(smart_card_atr_t *card_ptr, bool verbose) { uint8_t want_proto = atr_first_proto(card_ptr->atr, card_ptr->atr_len); uint8_t want = sc_pps_best_ta1(card_ptr->atr, card_ptr->atr_len); -#if SAM_SC_FORCE_T1_TA1_95 +#if SAM_SC_FORCE_T1_PROFILE if (request_sam_t1 && (s_card_protocols & SC_PROTO_T1)) { want_proto = 1; want = SAM_SC_T1_TA1; diff --git a/armsrc/i2c.h b/armsrc/i2c.h index cbc050b78..66ae7fa6b 100644 --- a/armsrc/i2c.h +++ b/armsrc/i2c.h @@ -57,10 +57,10 @@ // SAM secure-channel transport policy for the performance build. Artemis // offers T=0 first in its ATR; request its advertised T=1 service explicitly -// and use the validated Fi=512/Di=16 rate. This is protocol selection only: +// and use Fi=512/Di=32 with SIM firmware v4.66. This is protocol selection only: // it does not enable APDU dumps or other bring-up diagnostics. -#define SAM_SC_FORCE_T1_TA1_95 1 -#define SAM_SC_T1_TA1 0x95 +#define SAM_SC_FORCE_T1_PROFILE 1 +#define SAM_SC_T1_TA1 0x96 // The SIM module v4 supports up to 384 bytes for the length. #define ISO7816_MAX_FRAME 270 diff --git a/armsrc/sam_sc.c b/armsrc/sam_sc.c index 5ea4f22ab..f1d3462ba 100644 --- a/armsrc/sam_sc.c +++ b/armsrc/sam_sc.c @@ -522,7 +522,7 @@ void sam_sc_handler(const PacketCommandNG *c) { s_sam_sc_session_active = false; I2C_Reset_EnterMainProgram(); StartTicks(); -#if SAM_SC_FORCE_T1_TA1_95 +#if SAM_SC_FORCE_T1_PROFILE sc_request_sam_t1_profile(); #endif smart_card_atr_t card; diff --git a/client/resources/sim024.bin b/client/resources/sim024.bin new file mode 100644 index 0000000000000000000000000000000000000000..5f79b5afc4403580ba16ea965eec9a79da8b9728 GIT binary patch literal 7940 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 literal 0 HcmV?d00001 diff --git a/client/resources/sim024.sha512.txt b/client/resources/sim024.sha512.txt new file mode 100644 index 000000000..3cbf2209d --- /dev/null +++ b/client/resources/sim024.sha512.txt @@ -0,0 +1 @@ +291660D9063C74204D04AAEDE5925B7DF662C48AF8C0733BC923E5566D42109A72EB97097C6CBD21FD928EB2AF53F57BA35905B523EA3A3CCCF2315191C7BAEA