rustdesk/hbb_common
1
0
Fork 0
mirror of https://github.com/rustdesk/hbb_common.git synced 2026-07-12 17:53:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #546 from fufesou/fix/symmetric-crypt-compatibility

Browse Source 
fix(crypt): symmetric crypt compatibility
This commit is contained in:
RustDesk
2026-06-01 11:33:25 +08:00
committed by GitHub
parent 4d8af61d5c 82ce6e7327
commit e50ac3cd48
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config.rs
+9 -3
View File
@@ -516,12 +516,17 @@ impl Config2 {
fn store(&self) {
let mut config = self.clone();
let stored = Config::load_::<Config2>("2");
if let Some(mut socks) = config.socks {
let stored_password = stored
.socks
.as_ref()
.map(|socks| socks.password.as_str())
.unwrap_or_default();
socks.password =
encrypt_str_or_original(&socks.password, PASSWORD_ENC_VERSION, ENCRYPT_MAX_LEN);
keep_encrypted_storage_if_plaintext_unchanged(&socks.password, stored_password);
config.socks = Some(socks);
}
let stored = Config::load_::<Config2>("2");
config.unlock_pin =
keep_encrypted_storage_if_plaintext_unchanged(&config.unlock_pin, &stored.unlock_pin);
Config::store_(&config, "2");
@@ -716,8 +721,9 @@ impl Config {
if !config.password.is_empty()
&& decode_permanent_password_h1_from_storage(&config.password).is_none()
{
let stored = Config::load_::<Config>("");
config.password =
encrypt_str_or_original(&config.password, PASSWORD_ENC_VERSION, ENCRYPT_MAX_LEN);
keep_encrypted_storage_if_plaintext_unchanged(&config.password, &stored.password);
}
let (stored_id, encrypted, _) =
decrypt_str_or_original(&config.enc_id, PASSWORD_ENC_VERSION);