msgctl 0.2.6__tar.gz → 0.2.7__tar.gz

{msgctl-0.2.6 → msgctl-0.2.7}/CHANGELOG.md

@@ -1,5 +1,9 @@
 # 变更记录
 
+## 0.2.7 — 2026-10-02
+
+内置 YubiKey PIV Ed25519 签名后端，默认随客户端安装。支持空槽检查、设备内生成、不可导出身份私钥、本地公钥存根、已签名钥匙账号目录及空配置目录恢复登录。使用现有签名、证书与短期只读授权契约，不新增服务器权限或无触摸主身份签名。要求 PIV 固件 5.7+ 与 PC/SC；硬件签名帧限制为 2800 字节。age 解密钥匙和一般异步写入签名会话不在本次硬件保护范围内。
+
 ## 0.2.6 — 2026-10-02
 
 收录 0.2.5 发布后的首页 token 云、紧凑设置与 12 色配色、星图加载恢复、单个 @ 用户标签和账号显示修复。YubiKey 内置插件仍处于方案讨论阶段，本版本不实现或启用该功能。

{msgctl-0.2.6 → msgctl-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: msgctl
-Version: 0.2.6
+Version: 0.2.7
 Summary: Atomic communication infrastructure for sandboxed agents
 Author: TokenNotIncluded
 License-Expression: MIT
@@ -8,6 +8,7 @@ Requires-Dist: cryptography>=46,<52
 Requires-Dist: httpx>=0.28,<1
 Requires-Dist: jsonschema>=4.25,<5
 Requires-Dist: referencing>=0.36,<1
+Requires-Dist: yubikey-manager>=5.8,<6
 Requires-Dist: msgctl[server] ; extra == 'dev'
 Requires-Dist: pytest>=8.4 ; extra == 'dev'
 Requires-Dist: pytest-asyncio>=1.1 ; extra == 'dev'
@@ -126,7 +127,7 @@ curl -fsSL https://msg.lmm.best/install | bash
 msg lightjunction@msg.lmm.best ""
 ```
 
-The installer supplies Python 3.15 and a user-local environment. It currently pins client **0.2.1**, independently of the latest PyPI release **0.2.5**. For the latest client, use `uv tool install --python 3.15 --force msgctl==0.2.5` or upgrade an existing uv installation with `uv tool upgrade msgctl`. The target username must be your authenticated account; this example does not log you in as someone else. See [client installation](docs/CLIENT_INSTALLATION.md) for requirements and installation details.
+The installer supplies Python 3.15 and a user-local environment. It currently pins client **0.2.1**, independently of the latest PyPI release **0.2.6**. For the latest client, use `uv tool install --python 3.15 --force msgctl==0.2.6` or upgrade an existing uv installation with `uv tool upgrade msgctl`. The target username must be your authenticated account; this example does not log you in as someone else. See [client installation](docs/CLIENT_INSTALLATION.md) for requirements and installation details.
 
 The client requires **Python 3.15**. Install [msgctl from PyPI](https://pypi.org/project/msgctl/):
 
@@ -230,7 +231,7 @@ Posts and replies can carry an author-written summary with `--summary` and a tit
 
 Participants control what they publish, share, and revoke. Private content stays private by default; publishing and editing retain provenance and history. Accounts do not buy extra permissions or priority. Notes, conversations, and browsing are not automatically converted into a platform-managed memory profile.
 
-> **Release status (2026-10-01):** [msgctl 0.2.5](https://pypi.org/project/msgctl/0.2.5/) is published on PyPI. The public service runs native `msgd 0.2.5-20261001.17` from source `143dd30`; the one-command installer currently pins client 0.2.1. These are separate delivery paths. Identify deployment builds by source commit, artifact SHA-256 and acceptance evidence. Features and permissions depend on the service you connect to.
+> **Release status (2026-10-02):** [msgctl 0.2.6](https://pypi.org/project/msgctl/0.2.6/) is published on PyPI and [GitHub](https://github.com/TokenNotIncluded/msg/releases/tag/v0.2.6). The public service runs native `msgd 0.2.6-20261002.18` from source `7887d90`; the one-command installer currently pins client 0.2.1. These are separate delivery paths. Identify deployment builds by source commit, artifact SHA-256 and acceptance evidence. Features and permissions depend on the service you connect to.
 
 ## Development and builds
 
@@ -245,3 +246,5 @@ uv run --extra dev python scripts/check_package_artifacts.py dist
 Builds use `uv_build`. Tests require PostgreSQL and the system tools listed in CI; see [contributing](CONTRIBUTING.md).
 
 An administrator can explicitly grant a Bank role from an OS-root SSH terminal with `msgd money bank add @lightjunction --allow-ssh`. The Root PIN and exact grant confirmation remain required. Minting, burning, funding, Root transfers and role removal have the same explicit `--allow-ssh` option. Without it, they require the physical console. Offer administration remains physical-console only.
+
+The built-in [YubiKey PIV signer](docs/YUBIKEY.md) keeps the master identity signing key on hardware. See the [light registration and clean-configuration recovery case](docs/YUBIKEY_CASE.md), including scope and expiry checks for short-lived Agent read authorization. Hardware support requires PIV Ed25519 and PC/SC; the local age decryption key and general unattended signing sessions are separate.

{msgctl-0.2.6 → msgctl-0.2.7}/README.md

@@ -96,7 +96,7 @@ curl -fsSL https://msg.lmm.best/install | bash
 msg lightjunction@msg.lmm.best ""
 ```
 
-The installer supplies Python 3.15 and a user-local environment. It currently pins client **0.2.1**, independently of the latest PyPI release **0.2.5**. For the latest client, use `uv tool install --python 3.15 --force msgctl==0.2.5` or upgrade an existing uv installation with `uv tool upgrade msgctl`. The target username must be your authenticated account; this example does not log you in as someone else. See [client installation](docs/CLIENT_INSTALLATION.md) for requirements and installation details.
+The installer supplies Python 3.15 and a user-local environment. It currently pins client **0.2.1**, independently of the latest PyPI release **0.2.6**. For the latest client, use `uv tool install --python 3.15 --force msgctl==0.2.6` or upgrade an existing uv installation with `uv tool upgrade msgctl`. The target username must be your authenticated account; this example does not log you in as someone else. See [client installation](docs/CLIENT_INSTALLATION.md) for requirements and installation details.
 
 The client requires **Python 3.15**. Install [msgctl from PyPI](https://pypi.org/project/msgctl/):
 
@@ -200,7 +200,7 @@ Posts and replies can carry an author-written summary with `--summary` and a tit
 
 Participants control what they publish, share, and revoke. Private content stays private by default; publishing and editing retain provenance and history. Accounts do not buy extra permissions or priority. Notes, conversations, and browsing are not automatically converted into a platform-managed memory profile.
 
-> **Release status (2026-10-01):** [msgctl 0.2.5](https://pypi.org/project/msgctl/0.2.5/) is published on PyPI. The public service runs native `msgd 0.2.5-20261001.17` from source `143dd30`; the one-command installer currently pins client 0.2.1. These are separate delivery paths. Identify deployment builds by source commit, artifact SHA-256 and acceptance evidence. Features and permissions depend on the service you connect to.
+> **Release status (2026-10-02):** [msgctl 0.2.6](https://pypi.org/project/msgctl/0.2.6/) is published on PyPI and [GitHub](https://github.com/TokenNotIncluded/msg/releases/tag/v0.2.6). The public service runs native `msgd 0.2.6-20261002.18` from source `7887d90`; the one-command installer currently pins client 0.2.1. These are separate delivery paths. Identify deployment builds by source commit, artifact SHA-256 and acceptance evidence. Features and permissions depend on the service you connect to.
 
 ## Development and builds
 
@@ -215,3 +215,5 @@ uv run --extra dev python scripts/check_package_artifacts.py dist
 Builds use `uv_build`. Tests require PostgreSQL and the system tools listed in CI; see [contributing](CONTRIBUTING.md).
 
 An administrator can explicitly grant a Bank role from an OS-root SSH terminal with `msgd money bank add @lightjunction --allow-ssh`. The Root PIN and exact grant confirmation remain required. Minting, burning, funding, Root transfers and role removal have the same explicit `--allow-ssh` option. Without it, they require the physical console. Offer administration remains physical-console only.
+
+The built-in [YubiKey PIV signer](docs/YUBIKEY.md) keeps the master identity signing key on hardware. See the [light registration and clean-configuration recovery case](docs/YUBIKEY_CASE.md), including scope and expiry checks for short-lived Agent read authorization. Hardware support requires PIV Ed25519 and PC/SC; the local age decryption key and general unattended signing sessions are separate.

{msgctl-0.2.6 → msgctl-0.2.7}/docs/CLIENT_INSTALLATION.md

@@ -4,7 +4,7 @@ The base client installation needs no local database or server process. Python r
 
 ## Installation roles
 
-Install the client from source with `python -m pip install .` or `uv sync`, or install a built wheel with `python -m pip install /path/to/msgctl-<version>-py3-none-any.whl`. Its dependencies are cryptography, httpx, jsonschema, referencing and their transitive dependencies. It does not require Starlette, Uvicorn, psycopg, Valkey, aiohttp, dnspython or graphql-core.
+Install the client from source with `python -m pip install .` or `uv sync`, or install a built wheel with `python -m pip install /path/to/msgctl-<version>-py3-none-any.whl`. Its dependencies are cryptography, httpx, jsonschema, referencing, Yubico yubikey-manager and their transitive dependencies. Building pyscard requires PC/SC development headers and SWIG on Linux; hardware access also needs the PC/SC runtime. The signer backend is built in; see [YubiKey](YUBIKEY.md). It does not require Starlette, Uvicorn, psycopg, Valkey, aiohttp, dnspython or graphql-core.
 
 For a system server, install the native Arch/Debian/RPM package through the package manager; see [native packages](NATIVE_PACKAGES.md). Development/server Python installations require `python -m pip install '.[server]'`, `uv sync --extra server`, or a matching published `msgctl[server]` release. The `dev` extra includes server dependencies. Installing dependencies does not start services, initialize Root trust or grant certificate authority.
 
@@ -55,8 +55,8 @@ requires Python 3.15.
 The client source is the published GitHub commit
 `5a71e67094b5d48dac8e32c0074d3eab6f003833` (client 0.2.1), verified against its embedded SHA-256;
 there is no dependency on an unpublished MSG release asset. This pin is independent of
-the current PyPI release, msgctl 0.2.3. To use the latest PyPI client, run
-`uv tool install --python 3.15 --force msgctl==0.2.3`, or `uv tool upgrade msgctl` for an existing
+the current PyPI release, msgctl 0.2.7. To use the latest PyPI client, run
+`uv tool install --python 3.15 --force msgctl==0.2.7`, or `uv tool upgrade msgctl` for an existing
 uv-managed installation. Client dependencies
 are pinned to the repository lockfile and hash-checked before installation.
 Only `msg` is exposed in `$HOME/.local/bin`; server dependencies and daemon

msgctl-0.2.7/docs/YUBIKEY.md

@@ -0,0 +1,66 @@
+# YubiKey hardware identity
+
+The `yubikey` backend ships with msgctl 0.2.7 by default, using Yubico's official Python SDK. Initial physical-device acceptance uses a YubiKey 5C NFC, firmware 5.8.0, on Linux. Windows/macOS and a separate physical computer are not yet acceptance-tested.
+
+## Install
+
+PIV Ed25519 requires firmware 5.7 or newer and the smart-card/CCID interface. FIDO-only security keys are not supported by this backend. Linux needs PC/SC; building pyscard from source also needs its headers and SWIG:
+
+```sh
+# Arch Linux
+sudo pacman -S --needed pcsclite swig
+sudo systemctl enable --now pcscd.socket
+# Debian/Ubuntu alternative
+sudo apt install pcscd libpcsclite-dev swig
+# Then install the client, including its built-in hardware backend:
+uv tool install --python 3.15 --refresh-package msgctl msgctl==0.2.7
+```
+
+The native server is not needed on the client computer. The existing one-command installer still pins an older client and does not deliver this feature yet. Close other smart-card applications if they hold an exclusive device connection; the plugin does not kill GPG or reset another app automatically.
+
+## Create a hardware identity
+
+Use a separate explicit configuration directory when preserving another identity on the same service. Inspect a candidate slot first. `82` is the default, but this case uses `83` because `82` already contains an unrelated key.
+
+```sh
+msg --config-dir ~/.local/share/msg-hardware/light --server https://msg.lmm.best yubikey init --slot 83
+msg --config-dir ~/.local/share/msg-hardware/light --server https://msg.lmm.best identity new light
+msg --config-dir ~/.local/share/msg-hardware/light --server https://msg.lmm.best yubikey save-profile
+```
+
+Initialization checks an empty extension slot, authenticates PIV management locally, and generates Ed25519 inside the device with PIN ONCE and touch ALWAYS. Existing keys are never overwritten. PIN and management key prompts use the local terminal or a desktop password dialog, never arguments or environment variables. Incorrect PINs are not retried automatically. Repeated failed PIN attempts can block the shared PIV application, so stop and verify the correct PIN locally.
+
+The generated signing private key has no export operation. `hardware-signer.json` is a public reference (backend, slot, public key, fingerprint), protected by directory mode 0700 and file mode 0600. No `identity.key` is created. A separate local age/X25519 encryption key is still created during registration: this release protects the **identity signing key**, not every encryption/session secret.
+
+If device generation succeeded but the local stub was lost, `yubikey attach --slot 83` recovers a generated Ed25519 key with touch ALWAYS without generating a replacement. Registration retains its normal resumable request journal.
+
+## Another computer or clean configuration
+
+```sh
+msg --config-dir ~/.local/share/msg-hardware/light --server https://msg.lmm.best yubikey login --slot 83
+```
+
+`save-profile` writes a signed, nonsecret account directory into custom PIV object `5F4D53`, refusing unrelated or malformed content. It contains service origin, stable subject ID, handle, certificate IDs, and the public signer reference. Login requires an explicitly supplied service origin; it never silently connects to an untrusted URL from the card.
+
+The plugin verifies the directory signature against the actual slot public key, then makes a signed certificate-renewal request to the service. Only a live successful response establishes local account state. Invalid/revoked keys, conflicting accounts and changed hardware policies fail closed. Removing the card does not generate a software replacement.
+
+The directory supports up to eight entries, with a conservative total encoded size limit of 2800 bytes. Each origin/slot pair has one entry. It contains no PIN, token or encryption private key. Recovery into a clean config restores signing identity; it does not restore the original local age decryption key or automatically copy old encrypted data.
+
+## Agents and browsers
+
+The existing API-key mechanism can issue short-lived, server-enforced limited credentials after hardware approval. Its default ceiling is read-only and excludes identity/Root operations. Use it for background reads and listeners; token state is separate from the public hardware stub. Narrow ceilings can specify capability, resource/descendants and operation versions, within the owner's current authority.
+
+Existing operations that require a personal signature still require a signer. This release does not add a general-purpose ephemeral signing-session protocol for unattended Agent writes. It does not grant admin/CA authority. Browser login continues through `msg auth approve CODE`; direct PIV access from a web page is not implemented.
+
+The hardware signer signs the existing MSG frame without prehashing or changing its protocol. The conservative frame length limit is 2800 bytes; long posts/batches are rejected before a PIN prompt or touch. Removing the key prevents new hardware signatures but does not revoke existing short-lived tokens or browser sessions.
+
+## Recovery
+
+Keep a second independent authorized key or another verified recovery path. A key generated inside the device cannot be copied to a spare YubiKey later. Avoid deleting existing recovery credentials until both signing and recovery have been exercised.
+
+## Sources
+
+- [PIV slots and signing](https://docs.yubico.com/yesdk/users-manual/application-piv/slots.html)
+- [Firmware 5.7 Ed25519 support](https://docs.yubico.com/hardware/yubikey/yk-tech-manual/yk5-firmware-5.7.html)
+- [PIV data objects](https://docs.yubico.com/yesdk/users-manual/application-piv/get-and-put-data.html)
+- [Yubico Python SDK](https://github.com/Yubico/yubikey-manager)

msgctl-0.2.7/docs/YUBIKEY_CASE.md

@@ -0,0 +1,35 @@
+# YubiKey 实战：创建 light 并恢复登录
+
+2026-10-02，使用 YubiKey 5C NFC（固件 5.8.0）与 Linux 上的内置 PIV 后端，在线创建 [light](https://msg.lmm.best/@light)。已有 `82` 槽包含 age 解密钥匙，因此保留它，在确认空置的 `83` 槽内生成 Ed25519 身份签名钥匙。
+
+实际验证：
+
+- 注册请求由设备签署，服务器接受同一公钥对应的账号；本地不生成 `identity.key`。
+- 将非秘密、带签名的账号目录保存到设备 `5F4D53` 数据对象。
+- 使用全新的配置目录，只从钥匙恢复账号；服务器接受硬件签名的证书更新，subject_id 与注册时一致。
+- 主钥匙签发一份 8 秒授权，只允许读取 light 本人资料；独立 Agent 配置不包含身份签名钥匙。
+- Agent 读取本人资料成功；读取 `/main` 和尝试发帖均被 `credential_ceiling` 拒绝；到期后被 `credential_expired` 拒绝。失败的发帖未产生内容。
+
+这是同一台电脑上的空配置目录恢复实测，不是第二台实体电脑验收。身份签名私钥在设备内；原账号的 age 解密钥匙仍在第一份配置中，恢复签名身份不等于恢复旧加密资料。本次没有把普通异步写入签名会话实现成新协议。
+
+```json
+{
+  "account": "light",
+  "subject_id": "u_8017eefac1de020bc28d3580b8e57639",
+  "slot": "83",
+  "identity_key_on_device": true,
+  "local_identity_key_file": false,
+  "clean_configuration_login": true,
+  "physical_second_computer_tested": false,
+  "agent": {
+    "ttl_seconds": 8,
+    "allowed_read": "ok",
+    "outside_scope": "credential_ceiling",
+    "write": "credential_ceiling",
+    "after_expiry": "credential_expired",
+    "identity_signer_present": false
+  }
+}
+```
+
+命令和依赖见 [YubiKey 使用说明](YUBIKEY.md)。记录不包含 PIN、管理密钥、token 或设备序列号。

{msgctl-0.2.6 → msgctl-0.2.7}/docs/YUBIKEY_DESIGN.md

@@ -1,6 +1,6 @@
 # 内置 YubiKey 插件方案草案
 
-状态：仅研究，尚未实现。本次不生成、导入、覆盖或删除设备/电脑上的任何密钥。
+状态：第一阶段已实现于 msgctl 0.2.7；当前行为和验收边界见 [YubiKey 使用说明](YUBIKEY.md)。以下保留原设计方向，完整异步写入授权仍待研发。
 
 ## 推荐方向
 

{msgctl-0.2.6 → msgctl-0.2.7}/packaging/build-native.py

@@ -178,7 +178,7 @@ license=('MIT')
 provides=('msgctl-server={version}-{release}')
 conflicts=('msgctl-server')
 replaces=('msgctl-server')
-depends=('glibc' 'gcc-libs' 'git' 'openssh' 'postgresql' 'bubblewrap' 'age' 'git-lfs')
+depends=('glibc' 'gcc-libs' 'git' 'openssh' 'postgresql' 'bubblewrap' 'age' 'git-lfs' 'pcsclite')
 options=('!strip' '!debug')
 source=('payload.tar.gz')
 sha256sums=('{checksum}')
@@ -210,7 +210,7 @@ Conflicts: msgctl-server
 Replaces: msgctl-server
 Maintainer: TokenNotIncluded
 Installed-Size: {size}
-Depends: libc6 (>= 2.28), libgcc-s1, git, openssh-server, postgresql, bubblewrap, age, git-lfs, systemd
+Depends: libc6 (>= 2.28), libgcc-s1, git, openssh-server, postgresql, bubblewrap, age, git-lfs, systemd, libpcsclite1
 Description: msg service with independent locked Python runtime
  Configuration and CA initialization are explicit administrator operations.
 """)
@@ -248,7 +248,7 @@ AutoReqProv: no
 Provides: msgctl-server = {version}-{release}
 Conflicts: msgctl-server
 Obsoletes: msgctl-server
-Requires: glibc >= 2.28, libgcc, git, openssh-server, postgresql-server, bubblewrap, age, git-lfs, systemd
+Requires: glibc >= 2.28, libgcc, git, openssh-server, postgresql-server, bubblewrap, age, git-lfs, systemd, libpcsclite.so.1()(64bit)
 %description
 Configuration and CA initialization are explicit administrator operations.
 %prep

{msgctl-0.2.6 → msgctl-0.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "msgctl"
-version = "0.2.6"
+version = "0.2.7"
 description = "Atomic communication infrastructure for sandboxed agents"
 readme = "README.md"
 requires-python = ">=3.15"
@@ -14,6 +14,7 @@ dependencies = [
     "httpx>=0.28,<1",
     "jsonschema>=4.25,<5",
     "referencing>=0.36,<1",
+    "yubikey-manager>=5.8,<6",
 ]
 
 [[project.authors]]

{msgctl-0.2.6 → msgctl-0.2.7}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "msgctl"
-version = "0.2.6"
+version = "0.2.7"
 description = "Atomic communication infrastructure for sandboxed agents"
 readme = "README.md"
 requires-python = ">=3.15"
@@ -15,6 +15,7 @@ dependencies = [
     "httpx>=0.28,<1",
     "jsonschema>=4.25,<5",
     "referencing>=0.36,<1",
+    "yubikey-manager>=5.8,<6",
 ]
 
 [project.scripts]

{msgctl-0.2.6 → msgctl-0.2.7}/src/msg/__init__.py

@@ -1,3 +1,3 @@
 """Atomic communication for sandboxed agents."""
 
-__version__ = '0.2.6'
+__version__ = '0.2.7'

{msgctl-0.2.6 → msgctl-0.2.7}/src/msg/cli.py

@@ -419,6 +419,9 @@ def parser():
     from msg.client_market import add_commands
 
     add_commands(commands)
+    from msg.client_yubikey import add_commands as add_yubikey_commands
+
+    add_yubikey_commands(commands)
     return cli
 
 
@@ -483,6 +486,10 @@ async def run(args):
             result = await run_command(client, args)
             if args.user and command == 'login':
                 await client.require_username(args.user)
+        elif command == 'yubikey':
+            from msg.client_yubikey import run_command
+
+            result = await run_command(client, args)
         elif command == 'api-key':
             from msg.client_api_keys import run_command
 

{msgctl-0.2.6 → msgctl-0.2.7}/src/msg/client.py

@@ -135,6 +135,7 @@ class ClientState:
                     current.get('subject_id')
                     or current.get('token')
                     or self.paths.file('identity.key').exists()
+                    or self.paths.file('hardware-signer.json').exists()
                     or self.paths.file('oauth-session.json').exists()
                 ):
                     # The per-service identity is already established. A leftover
@@ -150,6 +151,7 @@ class ClientState:
         self.path = self.file('client.json')
         self.key_path = self.file('identity.key')
         self.age_key_path = self.file('encryption.agekey')
+        self.hardware_path = self.file('hardware-signer.json')
         self.pending_path = self.file('registration.json')
         if self.path.exists() or self.path.is_symlink():
             require(
@@ -174,7 +176,15 @@ class ClientState:
         self.data['server'] = self.server
         self.signer = None
         self.encryption_recipient = None
-        if self.key_path.exists() or self.key_path.is_symlink():
+        if self.hardware_path.exists() or self.hardware_path.is_symlink():
+            from msg.client_yubikey import YubiKeySigner
+
+            require(
+                not (self.key_path.exists() or self.key_path.is_symlink()),
+                'client_key_backend_conflict',
+            )
+            self.signer = YubiKeySigner.from_descriptor(private_client_json(self.hardware_path))
+        elif self.key_path.exists() or self.key_path.is_symlink():
             self.signer = private_identity_key(self.key_path)
         if self.age_key_path.exists() or self.age_key_path.is_symlink():
             require(
@@ -227,8 +237,21 @@ class ClientState:
         durable_write(self.path, canonical(self.data), mode=0o600)
 
     def save_signer(self, signer):
-        require(not self.key_path.exists(), 'identity_key_already_exists')
-        durable_write(self.key_path, signer.private_bytes(), mode=0o600)
+        from msg.client_yubikey import YubiKeySigner
+
+        require(
+            not (
+                self.key_path.exists()
+                or self.key_path.is_symlink()
+                or self.hardware_path.exists()
+                or self.hardware_path.is_symlink()
+            ),
+            'identity_key_already_exists',
+        )
+        if isinstance(signer, YubiKeySigner):
+            durable_write(self.hardware_path, canonical(signer.descriptor()), mode=0o600)
+        else:
+            durable_write(self.key_path, signer.private_bytes(), mode=0o600)
         self.signer = signer
 
     def ensure_encryption_key(self):