yeyinlaoying/vnt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/bugfix-2024-07-30-issues#65' into 1.2.x

Browse Source
This commit is contained in:
lbl8603
2024-07-30 22:54:37 +08:00
parent c2854352df fa9903ace1
commit 91ee751b07
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/config/file_config.rs
+4 -4
View File
@@ -126,12 +126,12 @@ pub fn read_config(file_path: &str) -> anyhow::Result<(Config, Vec<String>, bool
None => None, None => None,
Some(r) => Some(r.map_err(|e| anyhow!("ip {:?} error:{}", &file_conf.ip, e))?), Some(r) => Some(r.map_err(|e| anyhow!("ip {:?} error:{}", &file_conf.ip, e))?),
}; };
let cipher_model = { let cipher_model = if let Some(v) = file_conf.cipher_model {
CipherModel::from_str(&v).map_err(|e| anyhow!("{}", e))?
} else {
#[cfg(not(any(feature = "aes_gcm", feature = "server_encrypt")))] #[cfg(not(any(feature = "aes_gcm", feature = "server_encrypt")))]
if file_conf.password.is_some() && file_conf.cipher_model.is_none() { if file_conf.password.is_some() {
Err(anyhow!("cipher_model undefined"))? Err(anyhow!("cipher_model undefined"))?
} else if let Some(v) = file_conf.cipher_model {
CipherModel::from_str(&v).map_err(|e| anyhow!("{}", e))?
} else { } else {
CipherModel::None CipherModel::None
} }