v0.2.6-pre.016-fix.001
This commit is contained in:
@@ -6,7 +6,7 @@ resolver = "3"
|
|||||||
members = ["crates/ksp-app-config-desk", "crates/ksp-app-wallet-desk", "crates/ksp-config-lib", "crates/ksp-core-lib", "crates/ksp-logging-lib", "crates/ksp-onchain-transport-lib", "crates/ksp-wallet-lib"]
|
members = ["crates/ksp-app-config-desk", "crates/ksp-app-wallet-desk", "crates/ksp-config-lib", "crates/ksp-core-lib", "crates/ksp-logging-lib", "crates/ksp-onchain-transport-lib", "crates/ksp-wallet-lib"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.2.6-pre.16"
|
version = "0.2.6-pre.16.fix.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
repository = "https://git.sasedev.com/Sasedev/khadhroony-solana-project"
|
repository = "https://git.sasedev.com/Sasedev/khadhroony-solana-project"
|
||||||
|
|||||||
@@ -911,7 +911,7 @@ async fn rewrap_slot(
|
|||||||
kdf.clone(),
|
kdf.clone(),
|
||||||
crate::WalletKeyWrapV2::new_internal(nonce, std::vec![0_u8; crate::SECRET_KEY_BYTES + crate::KSPWALLET_V2_AEAD_TAG_BYTES]),
|
crate::WalletKeyWrapV2::new_internal(nonce, std::vec![0_u8; crate::SECRET_KEY_BYTES + crate::KSPWALLET_V2_AEAD_TAG_BYTES]),
|
||||||
);
|
);
|
||||||
let aad = crate::slot_aad(envelope, &provisional);
|
let aad = crate::slot_aad_v2(envelope, &provisional);
|
||||||
let wrapped = match crate::wrap_key(&derived, capability_key, &nonce, aad.as_slice()) {
|
let wrapped = match crate::wrap_key(&derived, capability_key, &nonce, aad.as_slice()) {
|
||||||
std::result::Result::Ok(value) => value,
|
std::result::Result::Ok(value) => value,
|
||||||
std::result::Result::Err(error) => return std::result::Result::Err(error),
|
std::result::Result::Err(error) => return std::result::Result::Err(error),
|
||||||
@@ -1005,7 +1005,7 @@ async fn seal_view_slot(
|
|||||||
material.kdf.clone(),
|
material.kdf.clone(),
|
||||||
crate::WalletKeyWrapV2::new_internal(material.wrap_nonce, std::vec![0_u8; crate::SECRET_KEY_BYTES + crate::KSPWALLET_V2_AEAD_TAG_BYTES]),
|
crate::WalletKeyWrapV2::new_internal(material.wrap_nonce, std::vec![0_u8; crate::SECRET_KEY_BYTES + crate::KSPWALLET_V2_AEAD_TAG_BYTES]),
|
||||||
);
|
);
|
||||||
let aad = crate::slot_aad(envelope, &provisional_slot);
|
let aad = crate::slot_aad_v2(envelope, &provisional_slot);
|
||||||
let wrapped_result = crate::wrap_key(&derived, metadata_key, &material.wrap_nonce, aad.as_slice());
|
let wrapped_result = crate::wrap_key(&derived, metadata_key, &material.wrap_nonce, aad.as_slice());
|
||||||
let wrapped = match wrapped_result {
|
let wrapped = match wrapped_result {
|
||||||
std::result::Result::Ok(value) => value,
|
std::result::Result::Ok(value) => value,
|
||||||
|
|||||||
61
deltas/0.2.6/pre.016-fix.001.md
Normal file
61
deltas/0.2.6/pre.016-fix.001.md
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
<!-- file: deltas/0.2.6/pre.016-fix.001.md -->
|
||||||
|
<!-- version: 1 -->
|
||||||
|
|
||||||
|
# Delta `0.2.6-pre.016-fix.001` — correction des AAD de key slots V2
|
||||||
|
|
||||||
|
## Base requise
|
||||||
|
|
||||||
|
```text
|
||||||
|
0.2.6-pre.016 appliquée
|
||||||
|
workspace.package.version = 0.2.6-pre.16
|
||||||
|
```
|
||||||
|
|
||||||
|
Le checkpoint opérateur fourni confirme que `cargo fmt --all` et `scripts/audit_rust_workspace_rules.py` sont propres, mais `cargo check --workspace` et `cargo clippy --workspace --all-targets` échouent dans `ksp-wallet-lib/src/wallet_v2.rs` avec deux erreurs `E0308`.
|
||||||
|
|
||||||
|
Les deux callsites concernés construisent un `WalletKeySlotV2` provisoire puis appellent encore le helper V1 :
|
||||||
|
|
||||||
|
```rust
|
||||||
|
crate::slot_aad(envelope, &provisional)
|
||||||
|
crate::slot_aad(envelope, &provisional_slot)
|
||||||
|
```
|
||||||
|
|
||||||
|
`slot_aad` accepte exclusivement `KspWalletEnvelopeV1` + `WalletKeySlotV1`. Le transcript V2 possède déjà son helper distinct `slot_aad_v2` pour `KspWalletEnvelopeV2` + `WalletKeySlotV2`.
|
||||||
|
|
||||||
|
## Signal technique
|
||||||
|
|
||||||
|
```text
|
||||||
|
workspace.package.version = 0.2.6-pre.16.fix.1
|
||||||
|
commit = v0.2.6-pre.016-fix.001
|
||||||
|
```
|
||||||
|
|
||||||
|
Aucun tag prerelease. Aucun changement npm/Tauri : le correctif touche uniquement le backend Rust de `ksp-wallet-lib`.
|
||||||
|
|
||||||
|
## Correction
|
||||||
|
|
||||||
|
Les deux callsites V2 sont corrigés vers :
|
||||||
|
|
||||||
|
```rust
|
||||||
|
crate::slot_aad_v2(envelope, &provisional)
|
||||||
|
crate::slot_aad_v2(envelope, &provisional_slot)
|
||||||
|
```
|
||||||
|
|
||||||
|
Le correctif ne modifie pas le wire V2 ni son framing. Il rétablit la séparation cryptographique déjà définie en `pre.015` :
|
||||||
|
|
||||||
|
- V1 utilise `slot_aad` et le domaine transcript V1 ;
|
||||||
|
- V2 utilise `slot_aad_v2` et le domaine transcript V2 ;
|
||||||
|
- aucun type V2 n'est converti vers les structures V1 ;
|
||||||
|
- aucun format, constante, fixture ou API publique n'est modifié ;
|
||||||
|
- Wallet Desk reste sur les APIs génériques de `pre.016`.
|
||||||
|
|
||||||
|
## Validation opérateur requise
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cargo fmt --all
|
||||||
|
python3 scripts/audit_rust_workspace_rules.py
|
||||||
|
cargo check --workspace
|
||||||
|
cargo clippy --workspace --all-targets
|
||||||
|
cargo test -p ksp-wallet-lib
|
||||||
|
cargo test -p ksp-app-wallet-desk
|
||||||
|
```
|
||||||
|
|
||||||
|
Si ce checkpoint est vert, `0.2.6-pre.016-fix.001` peut être commitée. Un `cargo test --workspace` complet reste recommandé avant d'ouvrir `pre.017`, mais aucun `cargo tauri build` ne doit être exécuté avant la candidate finale.
|
||||||
Reference in New Issue
Block a user