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/key_encryption.rs | |
| parent | 4f84dc460c3494286233afe9ca480d3b7c0186b1 (diff) | |
chore: bump rust-nostr v0.35
bump all rust-nostr packages
Diffstat (limited to 'src/lib/login/key_encryption.rs')
| -rw-r--r-- | src/lib/login/key_encryption.rs | 30 |
1 files changed, 9 insertions, 21 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 | } |