rustdesk лет назад: 2
Родитель
Сommit
79f0eb497b
2 измененных файлов с 4 добавлено и 2 удалено
  1. BIN
      db_v2.sqlite3
  2. 4 2
      src/common.rs

+ 4 - 2
src/common.rs

@@ -113,7 +113,8 @@ pub fn gen_sk(wait: u64) -> (String, Option<sign::SecretKey>) {
113
     if let Ok(mut file) = std::fs::File::open(sk_file) {
113
     if let Ok(mut file) = std::fs::File::open(sk_file) {
114
         let mut contents = String::new();
114
         let mut contents = String::new();
115
         if file.read_to_string(&mut contents).is_ok() {
115
         if file.read_to_string(&mut contents).is_ok() {
116
-            let sk = base64::decode(&contents).unwrap_or_default();
116
+            let contents = contents.trim();
117
+            let sk = base64::decode(contents).unwrap_or_default();
117
             if sk.len() == sign::SECRETKEYBYTES {
118
             if sk.len() == sign::SECRETKEYBYTES {
118
                 let mut tmp = [0u8; sign::SECRETKEYBYTES];
119
                 let mut tmp = [0u8; sign::SECRETKEYBYTES];
119
                 tmp[..].copy_from_slice(&sk);
120
                 tmp[..].copy_from_slice(&sk);
@@ -121,7 +122,8 @@ pub fn gen_sk(wait: u64) -> (String, Option<sign::SecretKey>) {
121
                 log::info!("Private key comes from {}", sk_file);
122
                 log::info!("Private key comes from {}", sk_file);
122
                 return (pk, Some(sign::SecretKey(tmp)));
123
                 return (pk, Some(sign::SecretKey(tmp)));
123
             } else {
124
             } else {
124
-                log::error!("Malformed private key. You probably have a trailing newline in the secret key file.");
125
+                // don't use log here, since it is async
126
+                println!("Fatal error: malformed private key in {sk_file}.");
125
                 std::process::exit(1);
127
                 std::process::exit(1);
126
             }
128
             }
127
         }
129
         }