catarrh/otaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix secured packet encryption offset, add Send to Card button, pCntr fix

Browse Source
This commit is contained in:
Антон Трошин
2026-08-08 09:58:38 +03:00
parent 99010e0451
commit 85e4258891
1 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+32 -5
View File
@@ -743,6 +743,7 @@
</div> </div>
<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="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="pysimSendOta()" class="mb-3 px-5 py-2.5 bg-emerald-600 text-white text-sm font-medium rounded hover:bg-emerald-700">Send to Card</button>
<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-2.5 bg-gray-100 dark:bg-slate-800"></textarea> <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-2.5 bg-gray-100 dark:bg-slate-800"></textarea>
</div> </div>
@@ -1743,11 +1744,10 @@ function genSp() {
const apdu = hexToBytes(apduHex); const apdu = hexToBytes(apduHex);
const macLen = hasMac ? 8 : 0;
const pCntr = (8 - (apdu.length % 8)) % 8; const pCntr = (8 - (apdu.length % 8)) % 8;
const pCntrByte = pCntr; const pCntrByte = pCntr;
const macLen = hasMac ? 8 : 0;
const spiOff = 4; const spiOff = 4;
const kicOff = 6; const kicOff = 6;
const secDataOff = 17 + macLen; const secDataOff = 17 + macLen;
@@ -1784,10 +1784,9 @@ function genSp() {
} }
if (ciphering && kicKey) { if (ciphering && kicKey) {
const cipherLen = packetLen - kicOff; const toEncrypt = packet.subarray(secDataOff, packetLen);
const toEncrypt = packet.subarray(kicOff, packetLen);
const encrypted = des3CbcEncrypt(toEncrypt, kicKey, new Uint8Array(8)); const encrypted = des3CbcEncrypt(toEncrypt, kicKey, new Uint8Array(8));
packet.set(encrypted, kicOff); packet.set(encrypted, secDataOff);
} }
resultEl.value = bytesToHex(packet); resultEl.value = bytesToHex(packet);
@@ -2647,6 +2646,34 @@ async function pysimApdu() {
pysimRefresh(); pysimRefresh();
} }
async function pysimSendOta() {
const connectedRow = document.getElementById('pysim-connected-row');
if (!connectedRow || connectedRow.classList.contains('hidden')) {
alert('Card reader server is not connected');
return;
}
const sp = document.getElementById('sp-result').value.replace(/[^0-9a-fA-F]/g, '').toUpperCase();
if (!sp) { alert('No secured packet to send. Generate a secure packet first.'); return; }
const statusEl = document.getElementById('pysim-status');
statusEl.innerHTML = '<span class="text-gray-500">Sending OTA...</span>';
try {
const data = await pysimFetch('/api/send-ota', { sp });
if (data.success) {
if (data.response_data) {
document.getElementById('resp-data').value = data.response_data;
document.getElementById('resp-sw1').value = data.sw.slice(0, 2);
document.getElementById('resp-sw2').value = data.sw.slice(2, 4);
switchTab('response');
}
statusEl.innerHTML = '<span class="text-green-600">OTA sent. SW: ' + data.sw + '</span>';
} else {
statusEl.innerHTML = '<span class="text-red-500">OTA failed: ' + (data.error || 'SW: ' + data.sw) + '</span>';
}
} catch (e) {
statusEl.innerHTML = '<span class="text-red-500">Error: ' + esc(e.message) + '</span>';
}
}
// ===== pysim sub-tabs ===== // ===== pysim sub-tabs =====
let pysimCmdHistory = []; let pysimCmdHistory = [];
let pysimCmdHistIdx = -1; let pysimCmdHistIdx = -1;