diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-09-25 14:37:17 +0100 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-09-25 14:37:17 +0100 |
| commit | d6faad17e814d252a72e3aca39a4b3898382bab9 (patch) | |
| tree | 16a238703293fe0d9cce04fa83de2af4a88f5433 /src/lib/login | |
| parent | 4f84dc460c3494286233afe9ca480d3b7c0186b1 (diff) | |
chore: bump rust-nostr v0.35
bump all rust-nostr packages
Diffstat (limited to 'src/lib/login')
| -rw-r--r-- | src/lib/login/key_encryption.rs | 30 | ||||
| -rw-r--r-- | src/lib/login/mod.rs | 10 |
2 files changed, 14 insertions, 26 deletions
diff --git a/src/lib/login/key_encryption.rs b/src/lib/login/key_encryption.rs index 3841d50..b50b507 100644 --- a/src/lib/login/key_encryption.rs +++ b/src/lib/login/key_encryption.rs | |||
| @@ -11,7 +11,7 @@ pub fn encrypt_key(keys: &Keys, password: &str) -> Result<String> { | |||
| 11 | 15 | 11 | 15 |
| 12 | }; | 12 | }; |
| 13 | Ok(nostr::nips::nip49::EncryptedSecretKey::new( | 13 | Ok(nostr::nips::nip49::EncryptedSecretKey::new( |
| 14 | keys.secret_key()?, | 14 | keys.secret_key(), |
| 15 | password, | 15 | password, |
| 16 | log2_rounds, | 16 | log2_rounds, |
| 17 | KeySecurity::Medium, | 17 | KeySecurity::Medium, |
| @@ -47,14 +47,8 @@ mod tests { | |||
| 47 | let decrypted_key = decrypt_key(TEST_KEY_1_ENCRYPTED, TEST_PASSWORD)?; | 47 | let decrypted_key = decrypt_key(TEST_KEY_1_ENCRYPTED, TEST_PASSWORD)?; |
| 48 | 48 | ||
| 49 | assert_eq!( | 49 | assert_eq!( |
| 50 | format!( | 50 | format!("{}", TEST_KEY_1_KEYS.secret_key().to_bech32().unwrap()), |
| 51 | "{}", | 51 | format!("{}", decrypted_key.secret_key().to_bech32().unwrap()), |
| 52 | TEST_KEY_1_KEYS.secret_key().unwrap().to_bech32().unwrap() | ||
| 53 | ), | ||
| 54 | format!( | ||
| 55 | "{}", | ||
| 56 | decrypted_key.secret_key().unwrap().to_bech32().unwrap() | ||
| 57 | ), | ||
| 58 | ); | 52 | ); |
| 59 | Ok(()) | 53 | Ok(()) |
| 60 | } | 54 | } |
| @@ -65,14 +59,8 @@ mod tests { | |||
| 65 | let decrypted_key = decrypt_key(TEST_KEY_1_ENCRYPTED_WEAK, TEST_WEAK_PASSWORD)?; | 59 | let decrypted_key = decrypt_key(TEST_KEY_1_ENCRYPTED_WEAK, TEST_WEAK_PASSWORD)?; |
| 66 | 60 | ||
| 67 | assert_eq!( | 61 | assert_eq!( |
| 68 | format!( | 62 | format!("{}", TEST_KEY_1_KEYS.secret_key().to_bech32().unwrap()), |
| 69 | "{}", | 63 | format!("{}", decrypted_key.secret_key().to_bech32().unwrap()), |
| 70 | TEST_KEY_1_KEYS.secret_key().unwrap().to_bech32().unwrap() | ||
| 71 | ), | ||
| 72 | format!( | ||
| 73 | "{}", | ||
| 74 | decrypted_key.secret_key().unwrap().to_bech32().unwrap() | ||
| 75 | ), | ||
| 76 | ); | 64 | ); |
| 77 | Ok(()) | 65 | Ok(()) |
| 78 | } | 66 | } |
| @@ -84,8 +72,8 @@ mod tests { | |||
| 84 | let newkey = decrypt_key(s.as_str(), TEST_PASSWORD)?; | 72 | let newkey = decrypt_key(s.as_str(), TEST_PASSWORD)?; |
| 85 | 73 | ||
| 86 | assert_eq!( | 74 | assert_eq!( |
| 87 | format!("{}", key.secret_key().unwrap().to_bech32().unwrap()), | 75 | format!("{}", key.secret_key().to_bech32().unwrap()), |
| 88 | format!("{}", newkey.secret_key().unwrap().to_bech32().unwrap()), | 76 | format!("{}", newkey.secret_key().to_bech32().unwrap()), |
| 89 | ); | 77 | ); |
| 90 | Ok(()) | 78 | Ok(()) |
| 91 | } | 79 | } |
| @@ -97,8 +85,8 @@ mod tests { | |||
| 97 | let newkey = decrypt_key(s.as_str(), TEST_PASSWORD)?; | 85 | let newkey = decrypt_key(s.as_str(), TEST_PASSWORD)?; |
| 98 | 86 | ||
| 99 | assert_eq!( | 87 | assert_eq!( |
| 100 | format!("{}", key.secret_key().unwrap().to_bech32().unwrap()), | 88 | format!("{}", key.secret_key().to_bech32().unwrap()), |
| 101 | format!("{}", newkey.secret_key().unwrap().to_bech32().unwrap()), | 89 | format!("{}", newkey.secret_key().to_bech32().unwrap()), |
| 102 | ); | 90 | ); |
| 103 | Ok(()) | 91 | Ok(()) |
| 104 | } | 92 | } |
diff --git a/src/lib/login/mod.rs b/src/lib/login/mod.rs index 825ec30..f262bda 100644 --- a/src/lib/login/mod.rs +++ b/src/lib/login/mod.rs | |||
| @@ -363,7 +363,7 @@ async fn fresh_login( | |||
| 363 | always_save: bool, | 363 | always_save: bool, |
| 364 | ) -> Result<(NostrSigner, UserRef)> { | 364 | ) -> Result<(NostrSigner, UserRef)> { |
| 365 | let app_key = Keys::generate(); | 365 | let app_key = Keys::generate(); |
| 366 | let app_key_secret = app_key.secret_key()?.to_secret_hex(); | 366 | let app_key_secret = app_key.secret_key().to_secret_hex(); |
| 367 | let relays = if let Some(client) = client { | 367 | let relays = if let Some(client) = client { |
| 368 | client | 368 | client |
| 369 | .get_fallback_signer_relays() | 369 | .get_fallback_signer_relays() |
| @@ -652,7 +652,7 @@ fn save_keys(git_repo: &Repo, keys: &nostr::Keys, always_save: bool) -> Result<( | |||
| 652 | .context("failed to get password input from interactor.password")?; | 652 | .context("failed to get password input from interactor.password")?; |
| 653 | encrypt_key(keys, &password)? | 653 | encrypt_key(keys, &password)? |
| 654 | } else { | 654 | } else { |
| 655 | keys.secret_key()?.to_bech32()? | 655 | keys.secret_key().to_bech32()? |
| 656 | }; | 656 | }; |
| 657 | 657 | ||
| 658 | if let Err(error) = | 658 | if let Err(error) = |
| @@ -745,9 +745,9 @@ fn extract_user_relays(public_key: &nostr::PublicKey, events: &[nostr::Event]) - | |||
| 745 | ))) | 745 | ))) |
| 746 | }) | 746 | }) |
| 747 | .map(|t| UserRelayRef { | 747 | .map(|t| UserRelayRef { |
| 748 | url: t.as_vec()[1].clone(), | 748 | url: t.as_slice()[1].clone(), |
| 749 | read: t.as_vec().len() == 2 || t.as_vec()[2].eq("read"), | 749 | read: t.as_slice().len() == 2 || t.as_slice()[2].eq("read"), |
| 750 | write: t.as_vec().len() == 2 || t.as_vec()[2].eq("write"), | 750 | write: t.as_slice().len() == 2 || t.as_slice()[2].eq("write"), |
| 751 | }) | 751 | }) |
| 752 | .collect() | 752 | .collect() |
| 753 | } else { | 753 | } else { |