Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ env:

jobs:
msrv:
name: Verify MSRV (1.96)
name: Verify MSRV (1.99)
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Install Rust Toolchain (1.96)
uses: dtolnay/rust-toolchain@1.96.0
- name: Install Rust Toolchain (1.99)
uses: dtolnay/rust-toolchain@1.99.0

- name: Check
run: cargo check --all-features
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project are documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.2.0] - 2026-10-08

### Changed

- Migrated the `FingerprintView` implementation bodies (30 key views) and the custom-codec test builder from the removed `Builder::new_from_bytes` API to the streaming shape `Builder::new(codec)?` + `update(bytes)` + `output_len(32)` + `try_build()`. The value 32 preserves the 32-byte fingerprints multi-hash 1.x produced. Requirement `multi-hash` raised 1.1 → 2.0. The crate requires multi-hash 2.0.0, which declares `rust-version = "1.99"`. No public API changes.
- Raised `rust-version` from 1.96 to 1.99 and applied clippy 0.1.99 fixes.

## [2.1.1] - 2026-10-07

### Changed
Expand Down Expand Up @@ -265,6 +272,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Major dependency updates: ed25519-dalek 3, blsful 4, elliptic-curve 0.14, vsss-rs 6, ssh-key 0.7.
- Initial published release on crates.io as `multi-key`.

[2.2.0]: https://github.com/cryptidtech/multi-key/compare/v2.1.1...v2.2.0
[2.1.1]: https://github.com/cryptidtech/multi-key/compare/v2.1.0...v2.1.1
[2.1.0]: https://github.com/cryptidtech/multi-key/compare/v2.0.0...v2.1.0
[1.1.1]: https://github.com/cryptidtech/multi-key/compare/v1.1.0...v1.1.1
Expand Down
24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "multi-key"
version = "2.1.1"
version = "2.2.0"
edition = "2024"
rust-version = "1.96"
rust-version = "1.99"
authors = ["Dave Grantham <dwg@linuxprogrammer.org>"]
description = "Multikey self-describing cryptographic key data"
repository = "https://github.com/cryptidtech/multi-key.git"
Expand Down Expand Up @@ -52,11 +52,11 @@ mceliece348864 = { version = "1.0", optional = true }
ml-dsa = "0.1.1"
ml-kem = "0.3"
multi-base = { version = "1.0", default-features = false }
multi-codec = "1.5"
multi-hash = "1.1"
multi-sig = "1.5"
multi-trait = { version = "1.0", default-features = false }
multi-util = "1.1"
multi-codec = "1.6"
multi-hash = "2.0"
multi-sig = "1.6"
multi-trait = { version = "1.1", default-features = false }
multi-util = "1.2"
p256 = { version = "0.14", features = ["ecdsa", "ecdh"] }
p384 = { version = "0.14", features = ["ecdsa", "ecdh"] }
p521 = { version = "0.14", features = ["ecdsa", "ecdh"] }
Expand All @@ -83,31 +83,31 @@ sntrup = "0.4.0"
ssh-encoding = "0.3"
subtle = "2"
thiserror = { version = "2.0" }
typenum = "1.17"
typenum = "1.20"
unsigned-varint = { version = "0.8", features = ["std"] }
vsss-rs = "6.0"
x25519-dalek = { version = "3.0", features = ["static_secrets", "getrandom"] }
zeroize = "1"
# Lamport support (feature-gated, default-enabled)
lamport_signature_plus = { version = "0.5.0", optional = true }
sha3 = { version = "0.12", optional = true }
blake2 = { version = "0.11.0-rc.6", optional = true }
blake2 = { version = "0.11.0", optional = true }
shake = { version = "0.1", optional = true }
# XMSS support (feature-gated, default-enabled)
xmss = { version = "0.1.0-pre.0", optional = true }

[target.'cfg(target_arch = "wasm32")'.dependencies]
blsful = { version = "4.0.0", default-features = false, features = ["rust"] }
blsful = { version = "4.1.0", default-features = false, features = ["rust"] }
getrandom_02 = { package = "getrandom", version = "0.2", features = ["js"] }
ssh-key = { version = "0.7.0-rc.11", default-features = false, features = ["alloc", "ecdsa", "ed25519", "p256", "p384", "p521"] }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
blsful = { version = "4.0.0", default-features = false, features = ["blst"] }
blsful = { version = "4.1.0", default-features = false, features = ["blst"] }
ssh-key = { version = "0.7.0-rc.11", default-features = false, features = ["alloc", "ecdsa", "ed25519", "p256", "p384", "p521"] }

[dev-dependencies]
criterion = { version = "0.8", features = ["html_reports"] }
proptest = "1.4"
proptest = "1.11"
serde_json = "1.0"
serde_test = "1.0"

Expand Down
2 changes: 1 addition & 1 deletion src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ mod tests {
#[test]
fn test_error_display() {
let err = Error::MissingSigil;
assert!(!err.to_string().is_empty());
assert_ne!(err.to_string(), "");
}

#[test]
Expand Down
5 changes: 4 additions & 1 deletion src/views/bls12381.rs
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,10 @@ impl<'a> FingerprintView for View<'a> {
kd.key_bytes()?
};
// hash the key bytes using the given codec
Ok(mh::Builder::new_from_bytes(codec, bytes)?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(bytes);
b.output_len(32);
Ok(b.try_build()?)
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/views/bls12381_g1_fndsa512.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/bls12381_g1_mayo1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/bls12381_g1_mayo2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/bls12381_g1_mldsa65.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/chacha20.rs
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@ impl<'a> FingerprintView for View<'a> {
kd.key_bytes()?
};
// hash the key bytes using the given codec
Ok(mh::Builder::new_from_bytes(codec, bytes)?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(bytes);
b.output_len(32);
Ok(b.try_build()?)
}
}
7 changes: 5 additions & 2 deletions src/views/classic_mceliece.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down Expand Up @@ -336,7 +339,7 @@ mod tests {
.fingerprint(Codec::Sha3256)
.unwrap();
let fp_bytes: Vec<u8> = fp.into();
assert!(!fp_bytes.is_empty());
assert_ne!(fp_bytes, Vec::<u8>::new());
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/ed25519.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,10 @@ impl<'a> FingerprintView for View<'a> {
kd.key_bytes()?
};
// hash the key bytes using the given codec
Ok(mh::Builder::new_from_bytes(codec, bytes)?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(bytes);
b.output_len(32);
Ok(b.try_build()?)
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/views/ed25519_fndsa512.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
7 changes: 5 additions & 2 deletions src/views/ed25519_mayo2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down Expand Up @@ -350,7 +353,7 @@ mod tests {
let fp1_bytes: Vec<u8> = fp1.into();
let fp2_bytes: Vec<u8> = fp2.into();
assert_eq!(fp1_bytes, fp2_bytes);
assert!(!fp1_bytes.is_empty());
assert_ne!(fp1_bytes, Vec::<u8>::new());
}

#[test]
Expand Down
5 changes: 4 additions & 1 deletion src/views/ed25519_mldsa65.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/fn_dsa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ impl<'a> FingerprintView for View<'a> {
kd.key_bytes()?
};
// hash the key bytes using the given codec
Ok(mh::Builder::new_from_bytes(codec, bytes)?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(bytes);
b.output_len(32);
Ok(b.try_build()?)
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/views/frodokem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/lamport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/lamport_merkle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/mayo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/ml_dsa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down
7 changes: 5 additions & 2 deletions src/views/ml_kem.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,10 @@ impl<'a> FingerprintView for View<'a> {
} else {
self.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, pub_bytes.as_slice())?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(pub_bytes.as_slice());
b.output_len(32);
Ok(b.try_build()?)
}
}

Expand Down Expand Up @@ -367,7 +370,7 @@ mod tests {
.fingerprint(Codec::Sha3256)
.unwrap();
let fp_bytes: Vec<u8> = fp.into();
assert!(!fp_bytes.is_empty());
assert_ne!(fp_bytes, Vec::<u8>::new());
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/views/nist_p.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,10 @@ impl<'a> FingerprintView for View<'a> {
let kd = dispatch_data_view(self.mk)?;
kd.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, bytes)?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(bytes);
b.output_len(32);
Ok(b.try_build()?)
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/views/rsa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,10 @@ impl<'a> FingerprintView for View<'a> {
let kd = dispatch_data_view(self.mk)?;
kd.key_bytes()?
};
Ok(mh::Builder::new_from_bytes(codec, bytes)?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(bytes);
b.output_len(32);
Ok(b.try_build()?)
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion src/views/secp256k1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,10 @@ impl<'a> FingerprintView for View<'a> {
kd.key_bytes()?
};
// hash the key bytes using the given codec
Ok(mh::Builder::new_from_bytes(codec, bytes)?.try_build()?)
let mut b = mh::Builder::new(codec)?;
b.update(bytes);
b.output_len(32);
Ok(b.try_build()?)
}
}
}
Expand Down
Loading
Loading