hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove cert file arg on installing cert

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.ne>
This commit is contained in:
fufesou 2023-11-26 14:26:45 +08:00
parent 2d456fd1fc
commit bb7300a055
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core_main.rs
View File

@ -201,13 +201,11 @@ pub fn core_main() -> Option<Vec<String>> {
.ok(); .ok();
return None; return None;
} else if args[0] == "--install-cert" { } else if args[0] == "--install-cert" {
if args.len() == 1 {
log::error!("--install-cert must be called with cert file path");
return None;
}
#[cfg(windows)] #[cfg(windows)]
hbb_common::allow_err!(crate::platform::windows::install_cert(&args[1])); hbb_common::allow_err!(crate::platform::windows::install_cert(
if args.len() > 2 && args[2] == "silent" { crate::platform::windows::DRIVER_CERT_FILE
));
if args.len() > 1 && args[1] == "silent" {
return None; return None;
} }
#[cfg(all(windows, feature = "virtual_display_driver"))] #[cfg(all(windows, feature = "virtual_display_driver"))]
@ -220,10 +218,12 @@ pub fn core_main() -> Option<Vec<String>> {
hbb_common::allow_err!(crate::platform::windows::uninstall_cert()); hbb_common::allow_err!(crate::platform::windows::uninstall_cert());
return None; return None;
} else if args[0] == "--install-idd" { } else if args[0] == "--install-idd" {
// Install cert if cert file is provided (2rd arg). #[cfg(windows)]
if args.len() == 2 { {
#[cfg(windows)] // It's ok to install cert multiple times.
hbb_common::allow_err!(crate::platform::windows::install_cert(&args[1])); hbb_common::allow_err!(crate::platform::windows::install_cert(
crate::platform::windows::DRIVER_CERT_FILE
));
} }
#[cfg(all(windows, feature = "virtual_display_driver"))] #[cfg(all(windows, feature = "virtual_display_driver"))]
if crate::virtual_display_manager::is_virtual_display_supported() { if crate::virtual_display_manager::is_virtual_display_supported() {

4
src/platform/windows.rs
View File

@ -63,6 +63,8 @@ use windows_service::{
use winreg::enums::*; use winreg::enums::*;
use winreg::RegKey; use winreg::RegKey;
pub const DRIVER_CERT_FILE: &str = "RustDeskIddDriver.cer";
pub fn get_cursor_pos() -> Option<(i32, i32)> { pub fn get_cursor_pos() -> Option<(i32, i32)> {
unsafe { unsafe {
#[allow(invalid_value)] #[allow(invalid_value)]
@ -1029,7 +1031,7 @@ if exist \"{tmp_path}\\{app_name} Tray.lnk\" del /f /q \"{tmp_path}\\{app_name}
let src_exe = std::env::current_exe()?.to_str().unwrap_or("").to_string(); let src_exe = std::env::current_exe()?.to_str().unwrap_or("").to_string();
let install_cert = if options.contains("driverCert") { let install_cert = if options.contains("driverCert") {
let s = format!(r#""{}" --install-cert "RustDeskIddDriver.cer""#, src_exe); let s = format!(r#""{}" --install-cert"#, src_exe);
if silent { if silent {
format!("{} silent", s) format!("{} silent", s)
} else { } else {