Expands M2A.3 from the original plan because the credential issuer pubkey had no provisioning path. Adds INS_SET_CREDENTIAL_ISSUER_PUBK = 0x25 to PersonalizationApplet, bumps CredentialStore FIELD_VERSION 2 -> 3 to add a 64 B credentialIssuerPubKey slot + set-flag, and pivots finalizeAccessDocument to run a one-shot CoseVerifier RFC 9052 COSE_Sign1 verify against the staged AD bytes before atomically setting accessDocumentLen + accessDocumentFinalized + accessDocumentVerified inside a JCSystem transaction. PersonalizationApplet holds one CoseVerifier instance constructed at install (the 768 B CLEAR_ON_DESELECT scratch only allocates once) plus a 65 B EEPROM scratch for staging the uncompressed issuer pubkey. Status word mapping: - missing issuer pubkey at finalize -> SW_CONDITIONS_NOT_SATISFIED (0x6985) - IssuerAuth signature mismatch -> SW_DATA_INVALID (0x6984) - length out of range -> SW_WRONG_DATA (0x6A80) On verify failure the store stays untouched -- both accessDocumentFinalized and accessDocumentVerified remain false. Harness side: TrustArtifacts gains credential_issuer_pub (loaded from trust_dir/issuer.pem). The orchestrator sends INS 0x25 after the existing key writes and before the AD chunks so the trust anchor is staged by the time FINALIZE_AD runs. Test vector: AD bytes + matching issuer pubkey x||y are hardcoded into PersonalizationAppletTest from the canonical trustgen artifacts at /home/work/aliro-trust (272 B AD against a known issuer.pem). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
132 lines
4.8 KiB
Python
132 lines
4.8 KiB
Python
"""Orchestrator tests — verifies the full APDU sequence is sent in the
|
|
right order, with the right shapes, and that a non-9000 response halts."""
|
|
|
|
import pytest
|
|
from cryptography.hazmat.primitives.asymmetric import ec
|
|
|
|
from aliro_harness.issuer.access_document import build_access_document
|
|
from aliro_harness.personalizer.apdus import (
|
|
INS_COMMIT,
|
|
INS_FINALIZE_ACCESS_DOC,
|
|
INS_SET_CRED_ISSUER_PUBK,
|
|
INS_SET_CRED_PRIV,
|
|
INS_SET_CRED_PUBK,
|
|
INS_SET_READER_PUBK,
|
|
INS_WRITE_ACCESS_DOC,
|
|
)
|
|
from aliro_harness.personalizer.credentials import (
|
|
extract_priv_scalar,
|
|
extract_pub_xy,
|
|
)
|
|
from aliro_harness.personalizer.orchestrator import (
|
|
PersonalizationError,
|
|
TrustArtifacts,
|
|
personalize_card,
|
|
)
|
|
|
|
|
|
class FakeTransport:
|
|
"""Records each APDU sent and returns 0x9000 unless preconfigured."""
|
|
|
|
def __init__(self, sw_overrides: dict[int, int] | None = None) -> None:
|
|
self.sent: list[bytes] = []
|
|
self._sw_overrides = sw_overrides or {}
|
|
|
|
def __call__(self, apdu: bytes) -> tuple[bytes, int]:
|
|
idx = len(self.sent)
|
|
self.sent.append(apdu)
|
|
return b"", self._sw_overrides.get(idx, 0x9000)
|
|
|
|
|
|
@pytest.fixture
|
|
def artifacts() -> TrustArtifacts:
|
|
cred = ec.generate_private_key(ec.SECP256R1())
|
|
reader = ec.generate_private_key(ec.SECP256R1())
|
|
issuer = ec.generate_private_key(ec.SECP256R1())
|
|
return TrustArtifacts(
|
|
credential_priv=extract_priv_scalar(cred),
|
|
credential_pubk_xy=extract_pub_xy(cred.public_key()),
|
|
reader_pubk_xy=extract_pub_xy(reader.public_key()),
|
|
credential_issuer_pub=extract_pub_xy(issuer.public_key()),
|
|
access_document=build_access_document(
|
|
issuer_private_key=issuer,
|
|
access_credential_public_key=cred.public_key(),
|
|
),
|
|
)
|
|
|
|
|
|
def test_full_sequence_in_expected_order(artifacts):
|
|
transport = FakeTransport()
|
|
personalize_card(transport, artifacts)
|
|
|
|
insns = [apdu[1] for apdu in transport.sent]
|
|
# SELECT (0xA4) → SET_PRIV → SET_PUBK → SET_READER_PUBK →
|
|
# SET_CRED_ISSUER_PUBK → WRITE_AD+ → FINALIZE_AD → COMMIT.
|
|
# SET_CRED_ISSUER_PUBK must land BEFORE WRITE_AD chunks so that by
|
|
# the time FINALIZE runs, the issuer trust anchor is staged.
|
|
assert insns[0] == 0xA4
|
|
assert insns[1] == INS_SET_CRED_PRIV
|
|
assert insns[2] == INS_SET_CRED_PUBK
|
|
assert insns[3] == INS_SET_READER_PUBK
|
|
assert insns[4] == INS_SET_CRED_ISSUER_PUBK
|
|
# AD writes (variable count) then a single finalize, then commit.
|
|
assert all(i == INS_WRITE_ACCESS_DOC for i in insns[5:-2])
|
|
assert insns[-2] == INS_FINALIZE_ACCESS_DOC
|
|
assert insns[-1] == INS_COMMIT
|
|
|
|
|
|
def test_credential_issuer_pubk_apdu_carries_exact_bytes(artifacts):
|
|
transport = FakeTransport()
|
|
personalize_card(transport, artifacts)
|
|
# Find the INS_SET_CRED_ISSUER_PUBK APDU.
|
|
issuer_apdu = next(a for a in transport.sent if a[1] == INS_SET_CRED_ISSUER_PUBK)
|
|
# CLA INS P1 P2 Lc data
|
|
assert issuer_apdu[0] == 0x80
|
|
assert issuer_apdu[2] == 0x00
|
|
assert issuer_apdu[3] == 0x00
|
|
assert issuer_apdu[4] == 0x40 # Lc = 64
|
|
assert issuer_apdu[5:] == artifacts.credential_issuer_pub
|
|
assert len(artifacts.credential_issuer_pub) == 64
|
|
|
|
|
|
def test_select_apdu_carries_provisioning_aid(artifacts):
|
|
transport = FakeTransport()
|
|
personalize_card(transport, artifacts)
|
|
select = transport.sent[0]
|
|
assert select.hex().upper().endswith("A000000909ACCE559901")
|
|
|
|
|
|
def test_credential_priv_apdu_carries_exact_bytes(artifacts):
|
|
transport = FakeTransport()
|
|
personalize_card(transport, artifacts)
|
|
apdu = transport.sent[1] # SET_CRED_PRIV right after SELECT
|
|
assert apdu[5:] == artifacts.credential_priv
|
|
|
|
|
|
def test_failure_at_set_credential_priv_aborts_sequence(artifacts):
|
|
# SELECT (idx 0) returns 9000, SET_CRED_PRIV (idx 1) returns 6985.
|
|
transport = FakeTransport(sw_overrides={1: 0x6985})
|
|
with pytest.raises(PersonalizationError) as exc_info:
|
|
personalize_card(transport, artifacts)
|
|
assert exc_info.value.sw == 0x6985
|
|
assert "SET credential_PrivK" in str(exc_info.value)
|
|
# No further APDUs should have been sent past the failure.
|
|
assert len(transport.sent) == 2
|
|
|
|
|
|
def test_access_document_chunks_concatenate_to_original(artifacts):
|
|
transport = FakeTransport()
|
|
personalize_card(transport, artifacts)
|
|
write_apdus = [a for a in transport.sent if a[1] == INS_WRITE_ACCESS_DOC]
|
|
# Each WRITE APDU: CLA INS P1 P2 Lc <chunk>
|
|
reconstructed = b"".join(a[5:] for a in write_apdus)
|
|
assert reconstructed == artifacts.access_document
|
|
|
|
|
|
def test_finalize_carries_total_ad_length_in_p1p2(artifacts):
|
|
transport = FakeTransport()
|
|
personalize_card(transport, artifacts)
|
|
finalize = next(a for a in transport.sent if a[1] == INS_FINALIZE_ACCESS_DOC)
|
|
total = (finalize[2] << 8) | finalize[3]
|
|
assert total == len(artifacts.access_document)
|