4
4
5
5
use anyhow:: { anyhow, Context , Result } ;
6
6
use clap:: { Parser , Subcommand } ;
7
+ use const_format:: formatcp;
7
8
use env_logger:: Builder ;
8
9
use log:: { debug, error, info, LevelFilter } ;
9
10
use std:: {
@@ -12,7 +13,7 @@ use std::{
12
13
ffi:: OsStr ,
13
14
fs,
14
15
ops:: { Deref , DerefMut } ,
15
- path:: { Path , PathBuf } ,
16
+ path:: { Path , PathBuf , MAIN_SEPARATOR } ,
16
17
str:: FromStr ,
17
18
} ;
18
19
use yubihsm:: object:: { Id , Type } ;
@@ -39,7 +40,9 @@ const PASSWD_NEW: &str = "Enter new password: ";
39
40
const PASSWD_NEW_2 : & str = "Enter password again to confirm: " ;
40
41
41
42
const INPUT_PATH : & str = "/usr/share/oks" ;
42
- const VERIFIER_PATH : & str = "/usr/share/oks/verifier.json" ;
43
+ const VERIFIER_FILE : & str = "verifier.json" ;
44
+ const VERIFIER_PATH : & str =
45
+ formatcp ! ( "{}{}{}" , INPUT_PATH , MAIN_SEPARATOR , VERIFIER_FILE ) ;
43
46
44
47
const OUTPUT_PATH : & str = "/var/lib/oks" ;
45
48
const STATE_PATH : & str = "/var/lib/oks/ca-state" ;
@@ -639,7 +642,7 @@ fn main() -> Result<()> {
639
642
let ( shares, verifier) = wrap. split ( & mut hsm) ?;
640
643
let verifier = serde_json:: to_string ( & verifier) ?;
641
644
debug ! ( "JSON: {}" , verifier) ;
642
- let verifier_path = args. output . join ( VERIFIER_PATH ) ;
645
+ let verifier_path = args. output . join ( VERIFIER_FILE ) ;
643
646
debug ! (
644
647
"Serializing verifier as json to: {}" ,
645
648
verifier_path. display( )
0 commit comments