Browse Source

fix Pk size check (#361)

* more descriptive error

* fix key size check
Paolo Asperti 2 years ago
parent
commit
94ae51458c
2 changed files with 3 additions and 3 deletions
  1. 3 0
      src/common.rs
  2. 0 3
      src/rendezvous_server.rs

+ 3 - 0
src/common.rs

@@ -120,6 +120,9 @@ pub fn gen_sk(wait: u64) -> (String, Option<sign::SecretKey>) {
120 120
                 let pk = base64::encode(&tmp[sign::SECRETKEYBYTES / 2..]);
121 121
                 log::info!("Private key comes from {}", sk_file);
122 122
                 return (pk, Some(sign::SecretKey(tmp)));
123
+            } else {
124
+                log::error!("Malformed private key. You probably have a trailing newline in the secret key file.");
125
+                std::process::exit(1);
123 126
             }
124 127
         }
125 128
     } else {

+ 0 - 3
src/rendezvous_server.rs

@@ -1174,9 +1174,6 @@ impl RendezvousServer {
1174 1174
                 let mut tmp = [0u8; sign::SECRETKEYBYTES];
1175 1175
                 tmp[..].copy_from_slice(&sk);
1176 1176
                 out_sk = Some(sign::SecretKey(tmp));
1177
-            } else {
1178
-                log::error!("Malformed private key");
1179
-                std::process::exit(1);
1180 1177
             }
1181 1178
         }
1182 1179