aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Le <git@lecris.dev>2026-02-10 03:25:55 +0100
committerGitHub <noreply@github.com>2026-02-09 18:25:55 -0800
commitf4b6d30940a7a13d7850d99adea8c2d94175100b (patch)
treeadfc902c4b4d6042f5a8c70b40caa51b63e7519c
parentchore: update changelog (diff)
downloadatuin-f4b6d30940a7a13d7850d99adea8c2d94175100b.zip
chore(deps): Update to tiny-bip39 2.0.0 (#3151)
<!-- Thank you for making a PR! Bug fixes are always welcome, but if you're adding a new feature or changing an existing one, we'd really appreciate if you open an issue, post on the forum, or drop in on Discord --> ## Checks - [x] I am happy for maintainers to push small adjustments to this PR, to speed up the review cycle - [x] I have checked that there are no existing pull requests for the same thing I don't know why the previous PR https://github.com/atuinsh/atuin/pull/2643 got auto-closed after a rebase, so I am re-creating it.
Diffstat (limited to '')
-rw-r--r--Cargo.lock11
-rw-r--r--crates/atuin-client/Cargo.toml2
-rw-r--r--crates/atuin-client/src/login.rs26
-rw-r--r--crates/atuin/Cargo.toml2
-rw-r--r--crates/atuin/src/command/client/account/login.rs26
-rw-r--r--crates/atuin/src/command/client/store/rekey.rs26
6 files changed, 34 insertions, 59 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 819a46fb..42e302fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2957,11 +2957,12 @@ checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
[[package]]
name = "pbkdf2"
-version = "0.11.0"
+version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
dependencies = [
"digest",
+ "hmac",
]
[[package]]
@@ -4803,12 +4804,10 @@ dependencies = [
[[package]]
name = "tiny-bip39"
-version = "1.0.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
+checksum = "a30fd743a02bf35236f6faf99adb03089bb77e91c998dac2c2ad76bb424f668c"
dependencies = [
- "anyhow",
- "hmac",
"once_cell",
"pbkdf2",
"rand 0.8.5",
diff --git a/crates/atuin-client/Cargo.toml b/crates/atuin-client/Cargo.toml
index c5057af7..f686960a 100644
--- a/crates/atuin-client/Cargo.toml
+++ b/crates/atuin-client/Cargo.toml
@@ -65,7 +65,7 @@ reqwest = { workspace = true, optional = true }
hex = { version = "0.4", optional = true }
sha2 = { version = "0.10", optional = true }
indicatif = "0.18.0"
-tiny-bip39 = "=1.0.0"
+tiny-bip39 = "2.0.0"
# theme
crossterm = { version = "0.29.0", features = ["serde"] }
diff --git a/crates/atuin-client/src/login.rs b/crates/atuin-client/src/login.rs
index ab265928..d72d1c09 100644
--- a/crates/atuin-client/src/login.rs
+++ b/crates/atuin-client/src/login.rs
@@ -23,24 +23,16 @@ pub async fn login(
let key = match bip39::Mnemonic::from_phrase(&key, bip39::Language::English) {
Ok(mnemonic) => encode_key(Key::from_slice(mnemonic.entropy()))?,
Err(err) => {
- match err.downcast_ref::<bip39::ErrorKind>() {
- Some(err) => {
- match err {
- // assume they copied in the base64 key
- bip39::ErrorKind::InvalidWord => key,
- bip39::ErrorKind::InvalidChecksum => {
- bail!("key mnemonic was not valid")
- }
- bip39::ErrorKind::InvalidKeysize(_)
- | bip39::ErrorKind::InvalidWordLength(_)
- | bip39::ErrorKind::InvalidEntropyLength(_, _) => {
- bail!("key was not the correct length")
- }
- }
+ match err {
+ // assume they copied in the base64 key
+ bip39::ErrorKind::InvalidWord(_) => key,
+ bip39::ErrorKind::InvalidChecksum => {
+ bail!("key mnemonic was not valid")
}
- _ => {
- // unknown error. assume they copied the base64 key
- key
+ bip39::ErrorKind::InvalidKeysize(_)
+ | bip39::ErrorKind::InvalidWordLength(_)
+ | bip39::ErrorKind::InvalidEntropyLength(_, _) => {
+ bail!("key was not the correct length")
}
}
}
diff --git a/crates/atuin/Cargo.toml b/crates/atuin/Cargo.toml
index 45eecb9b..9a866b6b 100644
--- a/crates/atuin/Cargo.toml
+++ b/crates/atuin/Cargo.toml
@@ -69,7 +69,7 @@ rpassword = "7.0"
semver = { workspace = true }
rustix = { workspace = true }
runtime-format = "0.1.3"
-tiny-bip39 = "1"
+tiny-bip39 = "2"
futures-util = "0.3"
fuzzy-matcher = "0.3.7"
colored = "2.0.4"
diff --git a/crates/atuin/src/command/client/account/login.rs b/crates/atuin/src/command/client/account/login.rs
index 504b8223..3a0d3c5c 100644
--- a/crates/atuin/src/command/client/account/login.rs
+++ b/crates/atuin/src/command/client/account/login.rs
@@ -75,24 +75,16 @@ impl Cmd {
match bip39::Mnemonic::from_phrase(&key, bip39::Language::English) {
Ok(mnemonic) => encode_key(Key::from_slice(mnemonic.entropy()))?,
Err(err) => {
- match err.downcast_ref::<bip39::ErrorKind>() {
- Some(err) => {
- match err {
- // assume they copied in the base64 key
- bip39::ErrorKind::InvalidWord => key,
- bip39::ErrorKind::InvalidChecksum => {
- bail!("key mnemonic was not valid")
- }
- bip39::ErrorKind::InvalidKeysize(_)
- | bip39::ErrorKind::InvalidWordLength(_)
- | bip39::ErrorKind::InvalidEntropyLength(_, _) => {
- bail!("key was not the correct length")
- }
- }
+ match err {
+ // assume they copied in the base64 key
+ bip39::ErrorKind::InvalidWord(_) => key,
+ bip39::ErrorKind::InvalidChecksum => {
+ bail!("key mnemonic was not valid")
}
- _ => {
- // unknown error. assume they copied the base64 key
- key
+ bip39::ErrorKind::InvalidKeysize(_)
+ | bip39::ErrorKind::InvalidWordLength(_)
+ | bip39::ErrorKind::InvalidEntropyLength(_, _) => {
+ bail!("key was not the correct length")
}
}
}
diff --git a/crates/atuin/src/command/client/store/rekey.rs b/crates/atuin/src/command/client/store/rekey.rs
index 918bb335..4c537a48 100644
--- a/crates/atuin/src/command/client/store/rekey.rs
+++ b/crates/atuin/src/command/client/store/rekey.rs
@@ -23,24 +23,16 @@ impl Rekey {
match bip39::Mnemonic::from_phrase(&key, bip39::Language::English) {
Ok(mnemonic) => encode_key(Key::from_slice(mnemonic.entropy()))?,
Err(err) => {
- match err.downcast_ref::<bip39::ErrorKind>() {
- Some(err) => {
- match err {
- // assume they copied in the base64 key
- bip39::ErrorKind::InvalidWord => key,
- bip39::ErrorKind::InvalidChecksum => {
- bail!("key mnemonic was not valid")
- }
- bip39::ErrorKind::InvalidKeysize(_)
- | bip39::ErrorKind::InvalidWordLength(_)
- | bip39::ErrorKind::InvalidEntropyLength(_, _) => {
- bail!("key was not the correct length")
- }
- }
+ match err {
+ // assume they copied in the base64 key
+ bip39::ErrorKind::InvalidWord(_) => key,
+ bip39::ErrorKind::InvalidChecksum => {
+ bail!("key mnemonic was not valid")
}
- _ => {
- // unknown error. assume they copied the base64 key
- key
+ bip39::ErrorKind::InvalidKeysize(_)
+ | bip39::ErrorKind::InvalidWordLength(_)
+ | bip39::ErrorKind::InvalidEntropyLength(_, _) => {
+ bail!("key was not the correct length")
}
}
}