Dangerous Things
782074f6ae
Three components, all bench-validated to varying depths: - applet/: CSA Aliro v1.0 Java Card applet for J3R180. AUTH0 + AUTH1 expedited-standard flow end-to-end green via PC/SC bench reader (aliro-bench-test). Userland AES-256-GCM and HMAC-SHA-256 layered on top of J3R180's primitives because the card lacks both natively. P-256 curve params seeded explicitly per J3R180's quirk. - harness/: Python orchestrator (aliro-trustgen, aliro-personalize, aliro-bench-test) for trust-bundle generation, card personalization via PersonalizationApplet, and PC/SC AUTH0+AUTH1 transactions. 126 pytest cases passing. - reader/STM32CubeExpansion_ALIRO_V1_0_0/: ST X-CUBE-ALIRO V1.0.0 with our NFC10A1 port (NUCLEO-U545RE-Q + X-NUCLEO-NFC10A1, ST25R200 shared with NFC09A1). nfc10-only/ project, NFC10A1 BSP shim, ALIRO_TRUST_OVERRIDE include into vendor's provisioning.c, and an ALIRO_APDU_TRACE wrapper around demoTransceiveBlocking. Boots, detects the J3R180, completes SELECT + AUTH0; AUTH1 currently fails with RFAL ERR_PROTO (0xB) — under investigation, see docs/plans/2026-04-20-nucleo-nfc10a1-port.md and bench-notes/. Excluded: x-cube-aliro.zip vendor archive, harness/.venv, build dirs, generated aliro_trust.h (contains private reader scalar), all PEMs. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
Fix ByteContainer.setBytes to reallocate data when the incoming length
|
|
differs from the currently stored length.
|
|
|
|
Upstream licel/jcardsim master drops `this.length != length` from the
|
|
reallocation guard; the DT fork kept it. Without the check, calling
|
|
setKey(buf13, 0, 13) then setKey(buf64, 32, 32) on the same key reuses the
|
|
already-sized-13 internal data[] and triggers ArrayIndexOutOfBoundsException
|
|
in the subsequent Util.arrayCopy.
|
|
|
|
This regression hits HKDF-Extract-then-Expand on the same HMACKey, which is
|
|
exactly the shape Aliro §8.3.1.4 / §8.3.1.13 require.
|
|
|
|
diff --git a/src/main/java/com/licel/jcardsim/crypto/ByteContainer.java b/src/main/java/com/licel/jcardsim/crypto/ByteContainer.java
|
|
--- a/src/main/java/com/licel/jcardsim/crypto/ByteContainer.java
|
|
+++ b/src/main/java/com/licel/jcardsim/crypto/ByteContainer.java
|
|
@@ -106,7 +106,7 @@ public final class ByteContainer {
|
|
* @param length length of data in byte array
|
|
*/
|
|
public void setBytes(byte[] buff, short offset, short length) {
|
|
- if (data == null) {
|
|
+ if (data == null || this.length != length) {
|
|
switch (memoryType) {
|
|
case JCSystem.MEMORY_TYPE_TRANSIENT_DESELECT:
|
|
data = JCSystem.makeTransientByteArray(length, JCSystem.CLEAR_ON_DESELECT);
|