44
55use anyhow:: { anyhow, Context , Result } ;
66use clap:: { Parser , Subcommand } ;
7+ use const_format:: formatcp;
78use env_logger:: Builder ;
89use log:: { debug, error, info, LevelFilter } ;
910use std:: {
@@ -12,7 +13,7 @@ use std::{
1213 ffi:: OsStr ,
1314 fs,
1415 ops:: { Deref , DerefMut } ,
15- path:: { Path , PathBuf } ,
16+ path:: { Path , PathBuf , MAIN_SEPARATOR } ,
1617 str:: FromStr ,
1718} ;
1819use yubihsm:: object:: { Id , Type } ;
@@ -39,7 +40,9 @@ const PASSWD_NEW: &str = "Enter new password: ";
3940const PASSWD_NEW_2 : & str = "Enter password again to confirm: " ;
4041
4142const 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 ) ;
4346
4447const OUTPUT_PATH : & str = "/var/lib/oks" ;
4548const STATE_PATH : & str = "/var/lib/oks/ca-state" ;
@@ -639,7 +642,7 @@ fn main() -> Result<()> {
639642 let ( shares, verifier) = wrap. split ( & mut hsm) ?;
640643 let verifier = serde_json:: to_string ( & verifier) ?;
641644 debug ! ( "JSON: {}" , verifier) ;
642- let verifier_path = args. output . join ( VERIFIER_PATH ) ;
645+ let verifier_path = args. output . join ( VERIFIER_FILE ) ;
643646 debug ! (
644647 "Serializing verifier as json to: {}" ,
645648 verifier_path. display( )
0 commit comments