From 73f46e99c410d3aca48d15df2ce9639a89292629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A2=D1=80=D0=BE=D1=88?=
 =?UTF-8?q?=D0=B8=D0=BD?= <i@atroshin.ru>
Date: Mon, 24 Aug 2026 20:34:01 +0300
Subject: [PATCH] genSp: unciphered packets drop CPL prefix + prominent PoR
 status; v1.9.5

pySim encode_cmd transmits the 2-byte CPL only when ciphering is
applied; unciphered packets start at CHL. genSp always emitted it,
so every SPI1=0x00 packet diverged from the pySim reference at byte 0
(sp-verify MISMATCH) and carried a length octet pair real cards need
not expect.

- genSp output: bytesToHex(ciphering ? packet : packet.subarray(2));
  MAC input unchanged (still covers the virtual-CPL frame, matching
  pySim's sign-then-strip convention)
- Secured packet page: PoR verdict now rendered prominently in a
  dedicated text-base semibold line ('PoR: por_ok' green / other
  statuses red) above the small detail line; hidden when no PoR was
  requested or the ENVELOPE failed
- sp.test.js: three unciphered expectations updated to CHL-first form;
  ciphered vectors untouched (byte-identical)
- version 1.9.4 -> 1.9.5 everywhere; SW cache otaman-v15 -> otaman-v16
---
 docs/api.md                   |  2 +-
 frontend/index.html           | 15 ++++++++++++---
 frontend/sw.js                |  2 +-
 frontend/tests/sp.test.js     | 10 +++++-----
 pyproject.toml                |  2 +-
 pysim_otaman_server/server.py |  2 +-
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/docs/api.md b/docs/api.md
index 811db5f..190d4af 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -54,7 +54,7 @@ Returns server version for compatibility checking.
 
 **Example response:**
 ```json
-{"version": "1.9.4"}
+{"version": "1.9.5"}
 ```
 
 ### `GET /api/status`
diff --git a/frontend/index.html b/frontend/index.html
index 71a7853..89ef629 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -18,7 +18,7 @@
 <div class="max-w-7xl mx-auto px-6 py-2">
 
 	<div class="flex items-center justify-between mb-3">
-		<h1 class="text-2xl font-bold text-heading">OTAMan <span id="slogan" class="text-sm font-normal text-gray-500 dark:text-slate-400 ml-2" data-l10n="SIM OTA with a Human Face">SIM OTA with a Human Face</span> <span class="text-xs text-gray-400 dark:text-slate-500 ml-1">v1.9.4</span></h1>
+		<h1 class="text-2xl font-bold text-heading">OTAMan <span id="slogan" class="text-sm font-normal text-gray-500 dark:text-slate-400 ml-2" data-l10n="SIM OTA with a Human Face">SIM OTA with a Human Face</span> <span class="text-xs text-gray-400 dark:text-slate-500 ml-1">v1.9.5</span></h1>
 		<div class="flex items-center gap-4">
 			<button id="install-btn" class="px-2 py-1 text-xs rounded border border-gray-300 dark:border-slate-600 hover:bg-gray-200 dark:hover:bg-slate-700" style="display:none">INSTALL PWA [for offline use]</button>
 			<a href="https://github.com/anttro/otaman" target="_blank" class="text-xs text-gray-400 hover:text-gray-600 dark:text-slate-500 dark:hover:text-slate-300">github</a>
@@ -812,9 +812,10 @@
 		<button onclick="genSp()" class="mb-3 px-5 py-2.5 bg-blue-600 text-white text-sm font-medium rounded hover:bg-blue-700" data-l10n="Generate Secure Packet">Generate Secure Packet</button>
 		<button onclick="pysimVerifySp()" id="sp-verify-btn" class="hidden mb-3 px-5 py-2.5 bg-slate-600 text-white text-sm font-medium rounded hover:bg-slate-700" data-l10n="Verify vs pySim">Verify vs pySim</button>
 		<button onclick="pysimSendOta()" id="sp-send-btn" class="hidden mb-3 px-5 py-2.5 bg-emerald-600 text-white text-sm font-medium rounded hover:bg-emerald-700" data-l10n="Send to Card">Send to Card</button>
+		<div id="sp-por-status" class="mt-2 text-base font-semibold font-mono hidden"></div>
 		<textarea id="sp-result" rows="3" readonly class="w-full font-mono border border-gray-300 dark:border-slate-600 text-sm rounded px-3 py-1.5 bg-gray-100 dark:bg-slate-800"></textarea>
-		<div id="sp-verify-result" class="mt-2 text-xs font-mono hidden"></div>
 		<div id="sp-send-result" class="mt-2 text-xs font-mono hidden"></div>
+		<div id="sp-verify-result" class="mt-2 text-xs font-mono hidden"></div>
 	</div>
 
 	<div id="tab-response" class="tab-content hidden">
@@ -2180,7 +2181,9 @@ function genSp() {
 		packet.set(encrypted, 10);
 	}
 
-	resultEl.value = bytesToHex(packet);
+	// pySim encode_cmd parity: the 2-byte CPL prefix is transmitted only when
+	// ciphering is applied; unciphered packets start at CHL (v1.9.5).
+	resultEl.value = bytesToHex(ciphering ? packet : packet.subarray(2));
 }
 
 // ===== BER-TLV =====
@@ -4036,7 +4039,9 @@ async function pysimSendOta() {
 	if (!sp) { alert('No secured packet to send. Generate a secure packet first.'); return; }
 	const statusEl = document.getElementById('pysim-status');
 	const sendResultEl = document.getElementById('sp-send-result');
+	const porStatusEl = document.getElementById('sp-por-status');
 	sendResultEl.classList.add('hidden');
+	porStatusEl.classList.add('hidden');
 	statusEl.innerHTML = '<span class="text-gray-500">' + t('Sending OTA...') + '</span>';
 	try {
 		const data = await pysimFetch('/api/send-ota', { sp, ...spParams() });
@@ -4052,6 +4057,10 @@ async function pysimSendOta() {
 				msg += ' | PoR status: ' + por.response_status + ' (TAR ' + por.tar + ')';
 				if (por.cntr) msg += ' | PoR CNTR: ' + por.cntr;
 				if (por.decoded && por.decoded.last_status_word) msg += ' | last SW ' + por.decoded.last_status_word + ' ' + (por.decoded.last_response_data || '');
+				const okPor = por.response_status === 'por_ok';
+				porStatusEl.textContent = 'PoR: ' + por.response_status;
+				porStatusEl.classList.remove('hidden', okPor ? 'text-red-600' : 'text-green-600');
+				porStatusEl.classList.add(okPor ? 'text-green-600' : 'text-red-600');
 			}
 			sendResultEl.textContent = msg;
 			if (por && por.raw) {
diff --git a/frontend/sw.js b/frontend/sw.js
index 5763878..bea221c 100644
--- a/frontend/sw.js
+++ b/frontend/sw.js
@@ -1,4 +1,4 @@
-const CACHE = 'otaman-v15';
+const CACHE = 'otaman-v16';
 const URLS = [
   'index.html',
   'help.html',
diff --git a/frontend/tests/sp.test.js b/frontend/tests/sp.test.js
index 5ddad3c..a81b451 100644
--- a/frontend/tests/sp.test.js
+++ b/frontend/tests/sp.test.js
@@ -93,13 +93,13 @@ test('ciphered + CC SPI 16/01 (counter_must_be_higher, plaintext PoR)', () => {
 test('unciphered + CC SPI 02/09', () => {
 	assert.strictEqual(
 		makeRun({ 'sp-spi1': '02', 'sp-spi2-hex': '09' }),
-		'001D1502091515B0000000000000010085A8CA1A9828B0BB00A40000023F00');
+		'1502091515B0000000000000010085A8CA1A9828B0BB00A40000023F00');
 });
 
-test('unciphered packet uses CPL = octets from CHL to end (0x001d)', () => {
+test('unciphered packet starts at CHL, no CPL prefix (pySim parity)', () => {
 	const out = makeRun({ 'sp-spi1': '02', 'sp-spi2-hex': '09' });
-	assert.strictEqual(out.slice(0, 4), '001D');
-	assert.strictEqual(out.length, 62);
+	assert.strictEqual(out.slice(0, 2), '15');
+	assert.strictEqual(out.length, 58);
 });
 
 test('sysmocom public reference vector (spi1 04 / spi2 19, cntr=0)', () => {
@@ -169,7 +169,7 @@ test('AES unciphered + CC SPI 12/09 (counter higher)', () => {
 			'sp-kic-key': KIC_AES,
 			'sp-kid-key': KID_AES,
 		}),
-		'001D1512092222B0001100000000110029826122C7A0B79500A40004023F00');
+		'1512092222B0001100000000110029826122C7A0B79500A40004023F00');
 });
 
 test('AES ciphered + CC SPI 1E/19 (counter +1)', () => {
diff --git a/pyproject.toml b/pyproject.toml
index 29ced13..d9e89e5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pysim-otaman-server"
-version = "1.9.4"
+version = "1.9.5"
 description = "HTTP REST server wrapping pysim for the OTAMan PWA"
 requires-python = ">=3.8"
 # pysim is a git-only dependency installed explicitly by setup.bat/setup.sh.
diff --git a/pysim_otaman_server/server.py b/pysim_otaman_server/server.py
index d93e794..58143a0 100644
--- a/pysim_otaman_server/server.py
+++ b/pysim_otaman_server/server.py
@@ -18,7 +18,7 @@ from osmocom.construct import GsmOrUcs2Adapter
 from osmocom.tlv import BER_TLV_IE
 
 
-VERSION = '1.9.4'
+VERSION = '1.9.5'
 
 
 # Static file serving (the PWA lives in <repo>/frontend, served by this server