Phase E: MINT -- real keypair, Zuse-signed DER cert, working default identity
capsule_mint_identity() (new capsule_mint.h/.c): mints a fresh identity onto a blank/unminted thumbdrive -- real Ed25519 keypair from virtio_rng, a fresh drive_uuid (independent random draw, not derived from the identity seed, per FABRIC-3.md §F.8 decision 3), a Zuse-signed DER cert in the CERTVERIFY format, and a small working default personality (a real WELCOME word, not a stub -- FABRIC-3.md §F.6/§F.8's own "default personality content" question stays open, but whatever mints today must actually do something when RUNCAP births it). Refuses to overwrite a drive that already reads as a recognized home-blocks drive, mirroring WRITE(10)'s own refuse-on-non-blank posture (decided now, not just "reasonable by analogy" as §F.8 left it). x509_build_user_cert() (x509_ed25519.h/.c): the encode-side counterpart to the existing decode functions (x509_extract_ed25519_pubkey(), x509_verify_signature(), x509_extract_serial()) -- a minimal DER TLV writer producing exactly the fields those functions read. Host-tested round-trip against the real decoder before trusting it in the kernel, including a high-bit-serial case that exercises the DER integer-padding rule; all assertions pass (pubkey/serial round-trip, signature verifies against the real issuer, correctly rejects the wrong key and a corrupted signature). New user_identity_seed_t (user_identity_seed.h): the on-disk record for a minted identity's own keypair, same magic+version+fields+pad-to-4096+ real-CRC convention as zuse_cert_devblock_t and homeblocks_sig_t. Fixed devblock layout: sig(1), cert(2), seed record(3), default personality(4). New MINT word (mama_forth_words.c) and a small accessor (sk_repl_get_attached_blk_dev(), repl.h/.c) exposing the currently attached USB device regardless of home-blocks recognition -- MINT's own target is a blank drive, which by definition never sets Phase D's sk_repl_get_homeblocks_dev(). Verified end-to-end live in QEMU: MINT on a genuinely blank test drive, then (after a detach/reattach so the sig cache picks up the fresh header -- a known workflow gap, not fixed here, flagged for whoever builds the real Console onboarding flow) RUNCAP birthed a VM from that drive's own newly-minted content, and VM-EXECing its WELCOME word printed the default personality banner. The full mint-to-birth Tripod identity flow works end to end for the first time. Clean 3-architecture regression boot confirms no side effects on normal boot. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019ZGkimpfyh63EZyRkNbkPD
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
21c143dd28
commit
f6e2737f1e
@@ -1,5 +1,5 @@
|
||||
# Capsule Block Manifest — Auto-generated
|
||||
<!-- Generated by mkcapsule --manifest 2026-08-28T18:28:25Z -->
|
||||
<!-- Generated by mkcapsule --manifest 2026-08-28T18:43:46Z -->
|
||||
<!-- DO NOT EDIT — re-run mkcapsule --manifest to refresh. -->
|
||||
<!-- Hand-written justifications and immutability notes live -->
|
||||
<!-- in MANIFEST.md alongside this auto-generated index. -->
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,63 @@
|
||||
/*
|
||||
StarForth — Steady-State Virtual Machine Runtime
|
||||
|
||||
Copyright (c) 2023–2025 Robert A. James
|
||||
All rights reserved.
|
||||
|
||||
Licensed under the StarForth License, Version 1.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* capsule_mint.h - MINT: mint a fresh identity onto a blank thumbdrive
|
||||
* (FABRIC-3.md §F.8/§F.19), the last piece of the original Tripod
|
||||
* vision. Writes a real keypair, a Zuse-signed cert, and a minimal
|
||||
* working default personality -- everything RUNCAP (capsule_runcap.h)
|
||||
* and CERTVERIFY need at a later attach.
|
||||
*/
|
||||
|
||||
#ifndef STARKERNEL_CAPSULE_MINT_H
|
||||
#define STARKERNEL_CAPSULE_MINT_H
|
||||
|
||||
#ifdef __STARKERNEL__
|
||||
|
||||
#include <stdint.h>
|
||||
#include "vm.h"
|
||||
|
||||
struct blkio_dev;
|
||||
|
||||
typedef enum {
|
||||
MINT_OK = 0,
|
||||
MINT_ERR_ALREADY_MINTED, /* dev already reads as a recognized home-blocks
|
||||
* drive -- refuses rather than overwrite,
|
||||
* mirroring WRITE(10)'s own blank-media
|
||||
* posture (§F.8, decided 2026-08-28). */
|
||||
MINT_ERR_NO_ZUSE_CERT, /* issuer_vm->zuse_cert_installed is 0 -- no
|
||||
* key to sign the new cert with. */
|
||||
MINT_ERR_NO_ENTROPY, /* virtio_rng not ready. */
|
||||
MINT_ERR_CERT_BUILD, /* x509_build_user_cert() failed (shouldn't
|
||||
* happen with fixed-size fields, but not
|
||||
* assumed away). */
|
||||
MINT_ERR_WRITE_FAIL, /* a devblock write failed partway through --
|
||||
* the drive may be left partially minted. */
|
||||
} MintResult;
|
||||
|
||||
/**
|
||||
* capsule_mint_identity - Mint a fresh identity onto dev.
|
||||
*
|
||||
* Layout written (devblock offsets from dev's own start; devblock 0 is
|
||||
* left alone, reserved for the block-subsystem's own generic header):
|
||||
* devblock 1 homeblocks_sig_t (HOMEBLOCKS_SIG_START_FBLOCK)
|
||||
* devblock 2 DER cert, Zuse-signed (cert_offset)
|
||||
* devblock 3 user_identity_seed_t (identity_src_offset)
|
||||
* devblock 4 default personality source (identity_src_offset+1)
|
||||
*
|
||||
* @param dev Already-open block device for the target drive.
|
||||
* @param issuer_vm The signing identity -- in practice always Hera's own
|
||||
* VM (Zuse's cert lives there, vm.h's zuse_cert_seed).
|
||||
* @return MINT_OK on success, an error code otherwise.
|
||||
*/
|
||||
MintResult capsule_mint_identity(struct blkio_dev *dev, VM *issuer_vm);
|
||||
|
||||
#endif /* __STARKERNEL__ */
|
||||
|
||||
#endif /* STARKERNEL_CAPSULE_MINT_H */
|
||||
@@ -81,6 +81,14 @@ VM *sk_repl_get_active_vm(void);
|
||||
struct blkio_dev *sk_repl_get_homeblocks_dev(void);
|
||||
const homeblocks_sig_t *sk_repl_get_homeblocks_sig(void);
|
||||
|
||||
/**
|
||||
* sk_repl_get_attached_blk_dev - The currently attached USB block
|
||||
* device, regardless of home-blocks recognition (FABRIC-3.md
|
||||
* §F.8/§F.19) -- MINT's own target, since a blank/unminted drive never
|
||||
* sets sk_repl_get_homeblocks_dev() above. NULL if nothing is attached.
|
||||
*/
|
||||
struct blkio_dev *sk_repl_get_attached_blk_dev(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
/*
|
||||
* user_identity_seed.h -- on-disk record format for a minted user
|
||||
* identity's own keypair (FABRIC-3.md §F.8, decision 2), stored in the
|
||||
* first devblock of a home-blocks drive's identity_src region
|
||||
* (homeblocks_sig_t.identity_src_offset). The devblocks that follow it
|
||||
* (identity_src_offset+1 .. identity_src_offset+identity_src_devblocks-1)
|
||||
* hold this identity's own raw FORTH personality/init source, read by
|
||||
* RUNCAP (capsule_runcap.h) at birth.
|
||||
*
|
||||
* Same raw-devblock, magic+version+fields+pad-to-4096, real-CRC-from-
|
||||
* day-one convention as zuse_cert_devblock_t (zuse_cert_devblock.h) and
|
||||
* homeblocks_sig_t -- a new, dedicated type rather than reusing
|
||||
* zuse_cert_devblock_t, per this project's "give real-shaped data its
|
||||
* own header" convention (Zuse's own record has no analogous public
|
||||
* cert field; a regular user's does, stored separately in the cert
|
||||
* region MINT also writes -- see homeblocks_sig_t.cert_offset).
|
||||
*/
|
||||
#ifndef STARKERNEL_USER_IDENTITY_SEED_H
|
||||
#define STARKERNEL_USER_IDENTITY_SEED_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#define USER_IDENTITY_SEED_MAGIC \
|
||||
((uint32_t)'U' | ((uint32_t)'I' << 8) | ((uint32_t)'D' << 16) | ((uint32_t)'S' << 24))
|
||||
|
||||
#define USER_IDENTITY_SEED_VERSION 1u
|
||||
|
||||
typedef struct {
|
||||
uint32_t magic; /* USER_IDENTITY_SEED_MAGIC; anything else means
|
||||
* "not yet minted" (blank/foreign bytes), not a
|
||||
* format-corruption error. */
|
||||
uint32_t version; /* USER_IDENTITY_SEED_VERSION */
|
||||
uint8_t seed[32]; /* Ed25519 seed -- this identity's own private key.
|
||||
* Regular users are thumbdrive-resident (unlike
|
||||
* Zuse's system-resident one) -- this is the
|
||||
* only copy. */
|
||||
uint8_t pubkey[32]; /* Ed25519 public key derived from seed at mint
|
||||
* time -- same value the cert region's
|
||||
* SubjectPublicKeyInfo holds. */
|
||||
uint64_t crc; /* CRC-64/ISO (block_subsystem.h's compute_crc64())
|
||||
* over every byte of this struct up to (not
|
||||
* including) this field. */
|
||||
uint8_t _pad[4096 - (4 + 4 + 32 + 32 + 8)];
|
||||
} user_identity_seed_t;
|
||||
|
||||
typedef char user_identity_seed_size_check[
|
||||
(sizeof(user_identity_seed_t) == 4096) ? 1 : -1];
|
||||
|
||||
#endif /* STARKERNEL_USER_IDENTITY_SEED_H */
|
||||
@@ -61,4 +61,34 @@ int x509_extract_serial(const uint8_t *der, size_t der_len,
|
||||
uint8_t *serial_out, size_t serial_out_cap,
|
||||
size_t *serial_len_out);
|
||||
|
||||
/*
|
||||
* x509_build_user_cert (added 2026-08-28, FABRIC-3.md §F.8/§F.19, MINT):
|
||||
* the encode-side counterpart to x509_verify_signature()/x509_extract_*
|
||||
* above. Builds a minimal DER-encoded X.509 certificate exercising
|
||||
* exactly the fields those functions read -- serialNumber, an Ed25519
|
||||
* SubjectPublicKeyInfo, an Ed25519-signed signatureValue -- and nothing
|
||||
* else. issuer/validity/subject are each encoded as an empty SEQUENCE
|
||||
* (valid, zero-length DER TLVs the decode side only ever skips, never
|
||||
* reads the content of); version is omitted entirely (implicit v1,
|
||||
* matching the decode side's own optional-version handling). This is
|
||||
* deliberately not a general-purpose X.509 builder -- same scope
|
||||
* discipline as the decode side's own doc comment above.
|
||||
*
|
||||
* @param out Caller-provided output buffer.
|
||||
* @param out_cap Its size in bytes.
|
||||
* @param subject_pubkey The new identity's own Ed25519 public key --
|
||||
* becomes the cert's SubjectPublicKeyInfo.
|
||||
* @param serial 16 bytes -- becomes the cert's serialNumber
|
||||
* (CERTVERIFY/BINDSTEP compare this against
|
||||
* homeblocks_sig_t.drive_uuid).
|
||||
* @param issuer_seed The signer's own Ed25519 seed (Zuse's
|
||||
* vm->zuse_cert_seed) -- signs the resulting
|
||||
* tbsCertificate bytes.
|
||||
* @return Number of bytes written to out, or 0 if out_cap was too small.
|
||||
*/
|
||||
size_t x509_build_user_cert(uint8_t *out, size_t out_cap,
|
||||
const uint8_t subject_pubkey[32],
|
||||
const uint8_t serial[16],
|
||||
const uint8_t issuer_seed[32]);
|
||||
|
||||
#endif /* STARKERNEL_X509_ED25519_H */
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,145 @@
|
||||
/*
|
||||
StarForth — Steady-State Virtual Machine Runtime
|
||||
|
||||
Copyright (c) 2023–2025 Robert A. James
|
||||
All rights reserved.
|
||||
|
||||
Licensed under the StarForth License, Version 1.0
|
||||
*/
|
||||
|
||||
#ifndef __STARKERNEL__
|
||||
#error "capsule_mint.c is kernel-only"
|
||||
#endif
|
||||
|
||||
#include "starkernel/capsule_mint.h"
|
||||
#include "starkernel/homeblocks_sig.h"
|
||||
#include "starkernel/user_identity_seed.h"
|
||||
#include "starkernel/x509_ed25519.h"
|
||||
#include "starkernel/ed25519.h"
|
||||
#include "starkernel/virtio_rng.h"
|
||||
#include "block_subsystem.h" /* compute_crc64() */
|
||||
#include "blkio.h"
|
||||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
|
||||
/* Fixed layout, devblock offsets from the drive's own start -- see
|
||||
* capsule_mint.h's own doc comment. */
|
||||
#define MINT_CERT_DEVBLOCK 2u
|
||||
#define MINT_CERT_DEVBLOCKS 1u
|
||||
#define MINT_IDENTITY_SRC_OFFSET 3u
|
||||
#define MINT_IDENTITY_SRC_DEVBLOCKS 2u /* 1 seed record + 1 personality source */
|
||||
#define MINT_METADATA_DEVBLOCKS 5u /* devblocks 0..4 reserved */
|
||||
|
||||
/* Real, working, minimal default personality -- FABRIC-3.md §F.6/§F.8's
|
||||
* "default personality content" question stays open (mint-time-fixed vs.
|
||||
* user-editable), but the identity this mints must actually do something
|
||||
* when RUNCAP births it, not just exist. Needs the "Block NNNN" header
|
||||
* capsule_exec_payload() requires (§F.18) -- discovered live, not
|
||||
* optional. 4999 is an unused block number (see capsules/ block-map). */
|
||||
static const char MINT_DEFAULT_PERSONALITY[] =
|
||||
"Block 4999\n"
|
||||
": WELCOME ( -- ) .\" Minted identity -- default personality\" CR ;\n"
|
||||
"WELCOME\n";
|
||||
|
||||
/* Write exactly one devblock (4096 bytes) at devblock offset `devblock`,
|
||||
* as 4 consecutive 1KiB forth-block writes -- same convention
|
||||
* homeblocks_sig_check()'s own read loop already uses. */
|
||||
static int write_devblock(struct blkio_dev *dev, uint32_t devblock,
|
||||
const uint8_t *buf4096) {
|
||||
uint32_t base = devblock * 4u;
|
||||
for (uint32_t i = 0; i < 4u; i++) {
|
||||
if (blkio_write((blkio_dev_t *)dev, base + i,
|
||||
buf4096 + (size_t)i * BLKIO_FORTH_BLOCK_SIZE) != BLKIO_OK) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
MintResult capsule_mint_identity(struct blkio_dev *dev, VM *issuer_vm) {
|
||||
if (!dev || !issuer_vm) return MINT_ERR_WRITE_FAIL;
|
||||
|
||||
/* Refuse to overwrite an already-recognized home-blocks drive --
|
||||
* mirrors WRITE(10)'s own refuse-on-non-blank-media posture (§F.8,
|
||||
* decided 2026-08-28: "reasonable by analogy" there, now decided). */
|
||||
{
|
||||
homeblocks_sig_t existing;
|
||||
if (homeblocks_sig_check(dev, HOMEBLOCKS_SIG_START_FBLOCK, &existing)
|
||||
== HOMEBLOCKS_SIG_OK) {
|
||||
return MINT_ERR_ALREADY_MINTED;
|
||||
}
|
||||
}
|
||||
|
||||
if (!issuer_vm->zuse_cert_installed) return MINT_ERR_NO_ZUSE_CERT;
|
||||
if (!virtio_rng_ready()) return MINT_ERR_NO_ENTROPY;
|
||||
|
||||
/* Fresh identity keypair. */
|
||||
uint8_t seed[32], pubkey[32];
|
||||
if (virtio_rng_get_bytes(seed, sizeof(seed)) != 0) return MINT_ERR_NO_ENTROPY;
|
||||
ed25519_keygen(seed, pubkey);
|
||||
|
||||
/* Fresh drive_uuid -- an independent random draw, not derived from
|
||||
* the identity seed (§F.8 decision 3: "which physical drive," not
|
||||
* "whose identity"). */
|
||||
uint8_t drive_uuid[16];
|
||||
if (virtio_rng_get_bytes(drive_uuid, sizeof(drive_uuid)) != 0)
|
||||
return MINT_ERR_NO_ENTROPY;
|
||||
|
||||
/* Cert: SubjectPublicKeyInfo = new pubkey, serialNumber = drive_uuid,
|
||||
* signed by Zuse's own on-device seed (§F.8 decision 4). */
|
||||
uint8_t cert[512];
|
||||
size_t cert_len = x509_build_user_cert(cert, sizeof(cert), pubkey,
|
||||
drive_uuid, issuer_vm->zuse_cert_seed);
|
||||
if (cert_len == 0 || cert_len > 4096) return MINT_ERR_CERT_BUILD;
|
||||
|
||||
uint8_t cert_block[4096];
|
||||
memset(cert_block, 0, sizeof(cert_block));
|
||||
memcpy(cert_block, cert, cert_len);
|
||||
if (write_devblock(dev, MINT_CERT_DEVBLOCK, cert_block) != 0)
|
||||
return MINT_ERR_WRITE_FAIL;
|
||||
|
||||
/* user_identity_seed_t record. */
|
||||
user_identity_seed_t idrec;
|
||||
memset(&idrec, 0, sizeof(idrec));
|
||||
idrec.magic = USER_IDENTITY_SEED_MAGIC;
|
||||
idrec.version = USER_IDENTITY_SEED_VERSION;
|
||||
memcpy(idrec.seed, seed, 32);
|
||||
memcpy(idrec.pubkey, pubkey, 32);
|
||||
idrec.crc = compute_crc64((const uint8_t *)&idrec, offsetof(user_identity_seed_t, crc));
|
||||
if (write_devblock(dev, MINT_IDENTITY_SRC_OFFSET, (const uint8_t *)&idrec) != 0)
|
||||
return MINT_ERR_WRITE_FAIL;
|
||||
|
||||
/* Default personality source, in the devblock right after the seed
|
||||
* record -- RUNCAP reads exactly this layout. */
|
||||
uint8_t personality_block[4096];
|
||||
memset(personality_block, 0, sizeof(personality_block));
|
||||
memcpy(personality_block, MINT_DEFAULT_PERSONALITY, sizeof(MINT_DEFAULT_PERSONALITY) - 1);
|
||||
if (write_devblock(dev, MINT_IDENTITY_SRC_OFFSET + 1u, personality_block) != 0)
|
||||
return MINT_ERR_WRITE_FAIL;
|
||||
|
||||
/* homeblocks_sig_t -- written last, so a crash/power-loss partway
|
||||
* through minting never leaves a drive that reads as a valid,
|
||||
* complete home-blocks drive with missing content behind it. */
|
||||
homeblocks_sig_t sig;
|
||||
memset(&sig, 0, sizeof(sig));
|
||||
sig.magic = HOMEBLOCKS_SIG_PACK(HOMEBLOCKS_SIG_VERSION_0);
|
||||
memcpy(sig.drive_uuid, drive_uuid, 16);
|
||||
sig.minted_time_ns = 0; /* no monotonic-ns source exists
|
||||
* anywhere in this codebase yet,
|
||||
* §F.8's own open item */
|
||||
sig.metadata_devblocks = MINT_METADATA_DEVBLOCKS;
|
||||
sig.cert_offset = MINT_CERT_DEVBLOCK;
|
||||
sig.cert_devblocks = MINT_CERT_DEVBLOCKS;
|
||||
sig.identity_src_offset = MINT_IDENTITY_SRC_OFFSET;
|
||||
sig.identity_src_devblocks = MINT_IDENTITY_SRC_DEVBLOCKS;
|
||||
sig.hdr_crc = homeblocks_sig_compute_crc(&sig);
|
||||
|
||||
uint8_t sig_block[4096];
|
||||
memcpy(sig_block, &sig, sizeof(sig));
|
||||
if (write_devblock(dev, HOMEBLOCKS_SIG_START_FBLOCK / 4u, sig_block) != 0)
|
||||
return MINT_ERR_WRITE_FAIL;
|
||||
|
||||
(void)blkio_flush((blkio_dev_t *)dev);
|
||||
|
||||
return MINT_OK;
|
||||
}
|
||||
@@ -40,6 +40,7 @@
|
||||
#include "starkernel/capsule.h"
|
||||
#include "starkernel/capsule_birth.h"
|
||||
#include "starkernel/capsule_runcap.h"
|
||||
#include "starkernel/capsule_mint.h"
|
||||
#include "starkernel/capsule_loader.h"
|
||||
#include "starkernel/capsule_run.h"
|
||||
#include "starkernel/capsule_loader.h"
|
||||
@@ -770,6 +771,53 @@ static void mama_word_vm_call(VM *vm)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief MINT ( -- ok? )
|
||||
* Mint a fresh identity onto the currently attached USB drive
|
||||
* (FABRIC-3.md §F.8/§F.19). Deliberately no name/string argument despite
|
||||
* F.8's original "S\" name\" MINT" sketch: this design never binds a VM
|
||||
* name at mint time -- the drive holds an anonymous, self-contained
|
||||
* identity, and a name is only assigned later, at RUNCAP birth (a
|
||||
* WIREBIND decision, not MINT's). Refuses cleanly (prints why) if
|
||||
* there's no attached drive, the drive already reads as a recognized
|
||||
* home-blocks drive, Zuse has no installed cert to sign with, or there's
|
||||
* no entropy source. Real, working code -- not the eventual Console
|
||||
* onboarding flow (§D.6), which will call this same C function.
|
||||
*/
|
||||
static void mama_word_mint(VM *vm)
|
||||
{
|
||||
struct blkio_dev *dev = sk_repl_get_attached_blk_dev();
|
||||
if (!dev) {
|
||||
console_println("MINT: no drive attached");
|
||||
vm_push(vm, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
MintResult r = capsule_mint_identity(dev, vm);
|
||||
switch (r) {
|
||||
case MINT_OK:
|
||||
console_println("MINT: identity minted");
|
||||
vm_push(vm, 1);
|
||||
return;
|
||||
case MINT_ERR_ALREADY_MINTED:
|
||||
console_println("MINT: refused -- drive already a recognized home-blocks drive");
|
||||
break;
|
||||
case MINT_ERR_NO_ZUSE_CERT:
|
||||
console_println("MINT: refused -- Zuse has no installed cert to sign with");
|
||||
break;
|
||||
case MINT_ERR_NO_ENTROPY:
|
||||
console_println("MINT: refused -- no entropy source");
|
||||
break;
|
||||
case MINT_ERR_CERT_BUILD:
|
||||
console_println("MINT: FAILED -- cert construction error");
|
||||
break;
|
||||
case MINT_ERR_WRITE_FAIL:
|
||||
console_println("MINT: FAILED -- devblock write error (drive may be partially minted)");
|
||||
break;
|
||||
}
|
||||
vm_push(vm, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief RUNCAP-TEST ( caddr u -- ok? rc )
|
||||
* Diagnostic-only word (FABRIC-3.md §F.6/§F.18): calls
|
||||
@@ -1168,6 +1216,7 @@ void register_mama_forth_words(VM *vm)
|
||||
register_word(vm, "CAPSULE-LEN@", mama_word_capsule_len_fetch);
|
||||
register_word(vm, "CAPSULE-BIRTH", mama_word_capsule_birth);
|
||||
register_word(vm, "CAPSULE-RUN", mama_word_capsule_run);
|
||||
register_word(vm, "MINT", mama_word_mint);
|
||||
register_word(vm, "RUNCAP-TEST", mama_word_runcap_test);
|
||||
register_word(vm, "MAMA-VM-ID", mama_word_mama_vm_id);
|
||||
register_word(vm, "VM-COUNT", mama_word_vm_count);
|
||||
@@ -1198,6 +1247,7 @@ void register_mama_forth_words(VM *vm)
|
||||
register_word(vm, "CAPSULE-LEN@", mama_word_capsule_len_fetch);
|
||||
register_word(vm, "CAPSULE-BIRTH", mama_word_capsule_birth);
|
||||
register_word(vm, "CAPSULE-RUN", mama_word_capsule_run);
|
||||
register_word(vm, "MINT", mama_word_mint);
|
||||
register_word(vm, "RUNCAP-TEST", mama_word_runcap_test);
|
||||
register_word(vm, "MAMA-VM-ID", mama_word_mama_vm_id);
|
||||
register_word(vm, "VM-COUNT", mama_word_vm_count);
|
||||
|
||||
@@ -219,3 +219,147 @@ int x509_extract_serial(const uint8_t *der, size_t der_len,
|
||||
*serial_len_out = slen;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* ===== DER encoding (x509_build_user_cert) ===== */
|
||||
|
||||
/* Appends one TLV (tag + DER length + content) to *pos, advancing it.
|
||||
* Short-form length only (content_len < 128) -- every field this encoder
|
||||
* ever writes fits comfortably under that, so long-form length encoding
|
||||
* (needed only for der_next()'s decode side, which must handle arbitrary
|
||||
* real-world certs) is not needed here. Returns 0 on success, -1 if
|
||||
* limit would be exceeded. */
|
||||
static int der_put_tlv(uint8_t **pos, uint8_t *limit, uint8_t tag,
|
||||
const uint8_t *content, size_t content_len) {
|
||||
if (content_len >= 128) return -1; /* short-form only, by construction */
|
||||
if ((size_t)(limit - *pos) < 2 + content_len) return -1;
|
||||
*(*pos)++ = tag;
|
||||
*(*pos)++ = (uint8_t)content_len;
|
||||
if (content_len) memcpy(*pos, content, content_len);
|
||||
*pos += content_len;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Ed25519 AlgorithmIdentifier ::= SEQUENCE { OID 1.3.101.112 } (no
|
||||
* parameters) -- same bytes x509_extract_ed25519_pubkey()/
|
||||
* x509_verify_signature() both already recognize. */
|
||||
static int der_put_ed25519_algid(uint8_t **pos, uint8_t *limit) {
|
||||
static const uint8_t ED25519_OID[3] = { 0x2B, 0x65, 0x70 };
|
||||
uint8_t oid_tlv[5];
|
||||
uint8_t *p = oid_tlv;
|
||||
if (der_put_tlv(&p, oid_tlv + sizeof(oid_tlv), 0x06,
|
||||
ED25519_OID, sizeof(ED25519_OID)) != 0) return -1;
|
||||
return der_put_tlv(pos, limit, 0x30, oid_tlv, (size_t)(p - oid_tlv));
|
||||
}
|
||||
|
||||
/* INTEGER-encode a fixed-size unsigned value: prepend a single 0x00 pad
|
||||
* byte if the high bit would otherwise make it read as a negative DER
|
||||
* INTEGER (mirrors x509_extract_serial()'s own strip-a-leading-pad
|
||||
* logic, in reverse). */
|
||||
static int der_put_uint_integer(uint8_t **pos, uint8_t *limit,
|
||||
const uint8_t *val, size_t val_len) {
|
||||
uint8_t buf[24];
|
||||
size_t n = 0;
|
||||
if (val_len + 1 > sizeof(buf)) return -1;
|
||||
if (val[0] & 0x80u) buf[n++] = 0x00;
|
||||
memcpy(buf + n, val, val_len);
|
||||
n += val_len;
|
||||
return der_put_tlv(pos, limit, 0x02, buf, n);
|
||||
}
|
||||
|
||||
size_t x509_build_user_cert(uint8_t *out, size_t out_cap,
|
||||
const uint8_t subject_pubkey[32],
|
||||
const uint8_t serial[16],
|
||||
const uint8_t issuer_seed[32]) {
|
||||
if (!out || !subject_pubkey || !serial || !issuer_seed) return 0;
|
||||
|
||||
uint8_t tbs_content[192];
|
||||
uint8_t *tp = tbs_content;
|
||||
uint8_t *tlim = tbs_content + sizeof(tbs_content);
|
||||
|
||||
/* serialNumber */
|
||||
if (der_put_uint_integer(&tp, tlim, serial, 16) != 0) return 0;
|
||||
/* signature (AlgorithmIdentifier) */
|
||||
if (der_put_ed25519_algid(&tp, tlim) != 0) return 0;
|
||||
/* issuer, validity, subject -- each an empty SEQUENCE; the decode
|
||||
* side only ever skips these three fields by length, never reads
|
||||
* their content (x509_extract_ed25519_pubkey()'s own comment). */
|
||||
if (der_put_tlv(&tp, tlim, 0x30, (const uint8_t *)0, 0) != 0) return 0;
|
||||
if (der_put_tlv(&tp, tlim, 0x30, (const uint8_t *)0, 0) != 0) return 0;
|
||||
if (der_put_tlv(&tp, tlim, 0x30, (const uint8_t *)0, 0) != 0) return 0;
|
||||
/* subjectPublicKeyInfo ::= SEQUENCE { algorithm, subjectPublicKey } */
|
||||
{
|
||||
uint8_t spki[48];
|
||||
uint8_t *sp = spki;
|
||||
uint8_t *slim = spki + sizeof(spki);
|
||||
if (der_put_ed25519_algid(&sp, slim) != 0) return 0;
|
||||
uint8_t bitstr[33];
|
||||
bitstr[0] = 0x00; /* unused-bits */
|
||||
memcpy(bitstr + 1, subject_pubkey, 32);
|
||||
if (der_put_tlv(&sp, slim, 0x03, bitstr, sizeof(bitstr)) != 0) return 0;
|
||||
if (der_put_tlv(&tp, tlim, 0x30, spki, (size_t)(sp - spki)) != 0) return 0;
|
||||
}
|
||||
|
||||
size_t tbs_len = (size_t)(tp - tbs_content);
|
||||
|
||||
/* tbsCertificate's own full TLV bytes (tag+length+content) -- what
|
||||
* Ed25519 actually signs, matching x509_verify_signature()'s own
|
||||
* tbs_raw framing exactly. tbs_len < 128 is a safe assumption for
|
||||
* every field set above, but tbsCertificate as a whole (~150+ bytes)
|
||||
* needs long-form length -- built by hand here rather than reusing
|
||||
* der_put_tlv()'s short-form-only helper. */
|
||||
uint8_t tbs_full[4 + sizeof(tbs_content)];
|
||||
size_t tbs_full_len;
|
||||
if (tbs_len < 128) {
|
||||
tbs_full[0] = 0x30;
|
||||
tbs_full[1] = (uint8_t)tbs_len;
|
||||
memcpy(tbs_full + 2, tbs_content, tbs_len);
|
||||
tbs_full_len = 2 + tbs_len;
|
||||
} else {
|
||||
tbs_full[0] = 0x30;
|
||||
tbs_full[1] = 0x81; /* long-form, 1 length byte follows */
|
||||
tbs_full[2] = (uint8_t)tbs_len;
|
||||
memcpy(tbs_full + 3, tbs_content, tbs_len);
|
||||
tbs_full_len = 3 + tbs_len;
|
||||
}
|
||||
|
||||
uint8_t sig[64];
|
||||
ed25519_sign(issuer_seed, tbs_full, tbs_full_len, sig);
|
||||
|
||||
uint8_t cert_content[4 + sizeof(tbs_full) + 8 + 68];
|
||||
uint8_t *cp = cert_content;
|
||||
uint8_t *clim = cert_content + sizeof(cert_content);
|
||||
|
||||
if ((size_t)(clim - cp) < tbs_full_len) return 0;
|
||||
memcpy(cp, tbs_full, tbs_full_len);
|
||||
cp += tbs_full_len;
|
||||
|
||||
if (der_put_ed25519_algid(&cp, clim) != 0) return 0;
|
||||
|
||||
{
|
||||
uint8_t sigbitstr[65];
|
||||
sigbitstr[0] = 0x00;
|
||||
memcpy(sigbitstr + 1, sig, 64);
|
||||
/* BIT STRING content is 65 bytes >= 128-threshold's neighbor --
|
||||
* still short-form (65 < 128), der_put_tlv() handles it directly. */
|
||||
if (der_put_tlv(&cp, clim, 0x03, sigbitstr, sizeof(sigbitstr)) != 0) return 0;
|
||||
}
|
||||
|
||||
size_t cert_content_len = (size_t)(cp - cert_content);
|
||||
|
||||
/* Outer Certificate ::= SEQUENCE { ... } -- needs long-form length too. */
|
||||
if (cert_content_len < 128) {
|
||||
if (out_cap < 2 + cert_content_len) return 0;
|
||||
out[0] = 0x30;
|
||||
out[1] = (uint8_t)cert_content_len;
|
||||
memcpy(out + 2, cert_content, cert_content_len);
|
||||
return 2 + cert_content_len;
|
||||
} else if (cert_content_len < 256) {
|
||||
if (out_cap < 3 + cert_content_len) return 0;
|
||||
out[0] = 0x30;
|
||||
out[1] = 0x81;
|
||||
out[2] = (uint8_t)cert_content_len;
|
||||
memcpy(out + 3, cert_content, cert_content_len);
|
||||
return 3 + cert_content_len;
|
||||
}
|
||||
return 0; /* every real field set above stays well under 256 total */
|
||||
}
|
||||
|
||||
@@ -88,6 +88,18 @@ const homeblocks_sig_t *sk_repl_get_homeblocks_sig(void) {
|
||||
return g_homeblocks_sig_valid ? &g_homeblocks_sig : (void *)0;
|
||||
}
|
||||
|
||||
/* The currently attached USB block device, regardless of whether it
|
||||
* checks out as a recognized home-blocks drive -- MINT (§F.8/§F.19)
|
||||
* targets a blank/unminted drive, which by definition never sets
|
||||
* g_homeblocks_dev above (that only latches on HOMEBLOCKS_SIG_OK).
|
||||
* Set once blk_subsys_attach_device() succeeds below, cleared on detach
|
||||
* alongside g_homeblocks_dev. */
|
||||
static blkio_dev_t *g_attached_blk_dev = (void *)0;
|
||||
|
||||
blkio_dev_t *sk_repl_get_attached_blk_dev(void) {
|
||||
return g_attached_blk_dev;
|
||||
}
|
||||
|
||||
/*===========================================================================
|
||||
* Idle heartbeat service
|
||||
*
|
||||
@@ -174,6 +186,7 @@ static void sk_repl_idle(VM *active_vm)
|
||||
}
|
||||
if (rc == 0 && blk_subsys_attach_device(&usb_blk_dev) == BLK_OK) {
|
||||
xdev->bot_msc_attached = 1;
|
||||
g_attached_blk_dev = &usb_blk_dev;
|
||||
} else {
|
||||
console_println("xhci: USB MSC block-subsystem attach failed");
|
||||
}
|
||||
@@ -193,6 +206,9 @@ static void sk_repl_idle(VM *active_vm)
|
||||
g_homeblocks_dev = (void *)0;
|
||||
g_homeblocks_sig_valid = 0;
|
||||
}
|
||||
if (g_attached_blk_dev == &usb_blk_dev) {
|
||||
g_attached_blk_dev = (void *)0;
|
||||
}
|
||||
}
|
||||
|
||||
/* FABRIC.md/FABRIC-2.md Section V item 6: "a cheap 'anything dirty?
|
||||
|
||||
Reference in New Issue
Block a user