diff --git a/src/cmd_challconfig.rs b/src/cmd_chall_config.rs similarity index 100% rename from src/cmd_challconfig.rs rename to src/cmd_chall_config.rs diff --git a/src/cmd_ecverify.rs b/src/cmd_ec_verify.rs similarity index 100% rename from src/cmd_ecverify.rs rename to src/cmd_ec_verify.rs diff --git a/src/cmd_filesign.rs b/src/cmd_file_sign.rs similarity index 100% rename from src/cmd_filesign.rs rename to src/cmd_file_sign.rs diff --git a/src/cmd_fileverify.rs b/src/cmd_file_verify.rs similarity index 100% rename from src/cmd_fileverify.rs rename to src/cmd_file_verify.rs diff --git a/src/cmd_hmacdecrypt.rs b/src/cmd_hmac_decrypt.rs similarity index 100% rename from src/cmd_hmacdecrypt.rs rename to src/cmd_hmac_decrypt.rs diff --git a/src/cmd_hmacencrypt.rs b/src/cmd_hmac_encrypt.rs similarity index 100% rename from src/cmd_hmacencrypt.rs rename to src/cmd_hmac_encrypt.rs diff --git a/src/cmd_generatekeypair.rs b/src/cmd_keypair_generate.rs similarity index 99% rename from src/cmd_generatekeypair.rs rename to src/cmd_keypair_generate.rs index 8fccd2f..17ddb7c 100644 --- a/src/cmd_generatekeypair.rs +++ b/src/cmd_keypair_generate.rs @@ -9,7 +9,7 @@ pub struct CommandImpl; impl Command for CommandImpl { fn name(&self) -> &str { - "generate-keypair" + "keypair-generate" } fn subcommand<'a>(&self) -> App<'a, 'a> { diff --git a/src/cmd_pivdecrypt.rs b/src/cmd_piv_decrypt.rs similarity index 100% rename from src/cmd_pivdecrypt.rs rename to src/cmd_piv_decrypt.rs diff --git a/src/cmd_pivecdh.rs b/src/cmd_piv_ecdh.rs similarity index 100% rename from src/cmd_pivecdh.rs rename to src/cmd_piv_ecdh.rs diff --git a/src/cmd_pivecsign.rs b/src/cmd_piv_ecsign.rs similarity index 100% rename from src/cmd_pivecsign.rs rename to src/cmd_piv_ecsign.rs diff --git a/src/cmd_pivgenerate.rs b/src/cmd_piv_generate.rs similarity index 100% rename from src/cmd_pivgenerate.rs rename to src/cmd_piv_generate.rs diff --git a/src/cmd_pivmeta.rs b/src/cmd_piv_meta.rs similarity index 100% rename from src/cmd_pivmeta.rs rename to src/cmd_piv_meta.rs diff --git a/src/cmd_pivrsasign.rs b/src/cmd_piv_rsasign.rs similarity index 100% rename from src/cmd_pivrsasign.rs rename to src/cmd_piv_rsasign.rs diff --git a/src/cmd_pivsummary.rs b/src/cmd_piv_summary.rs similarity index 100% rename from src/cmd_pivsummary.rs rename to src/cmd_piv_summary.rs diff --git a/src/cmd_pivverify.rs b/src/cmd_piv_verify.rs similarity index 100% rename from src/cmd_pivverify.rs rename to src/cmd_piv_verify.rs diff --git a/src/cmd_rsadecrypt.rs b/src/cmd_rsa_decrypt.rs similarity index 100% rename from src/cmd_rsadecrypt.rs rename to src/cmd_rsa_decrypt.rs diff --git a/src/cmd_rsaencrypt.rs b/src/cmd_rsa_encrypt.rs similarity index 100% rename from src/cmd_rsaencrypt.rs rename to src/cmd_rsa_encrypt.rs diff --git a/src/cmd_rsaverify.rs b/src/cmd_rsa_verify.rs similarity index 100% rename from src/cmd_rsaverify.rs rename to src/cmd_rsa_verify.rs diff --git a/src/cmd_signjwt.rs b/src/cmd_sign_jwt.rs similarity index 100% rename from src/cmd_signjwt.rs rename to src/cmd_sign_jwt.rs diff --git a/src/cmd_signjwtse.rs b/src/cmd_sign_jwt_se.rs similarity index 97% rename from src/cmd_signjwtse.rs rename to src/cmd_sign_jwt_se.rs index 04683dd..18344ee 100644 --- a/src/cmd_signjwtse.rs +++ b/src/cmd_sign_jwt_se.rs @@ -8,7 +8,7 @@ use rust_util::{util_msg, XResult}; use serde_json::{Map, Value}; use std::collections::BTreeMap; -use crate::cmd_signjwt::{build_jwt_parts, merge_header_claims, merge_payload_claims}; +use crate::cmd_sign_jwt::{build_jwt_parts, merge_header_claims, merge_payload_claims}; use crate::ecdsautil::parse_ecdsa_to_rs; use crate::keyutil::{parse_key_uri, KeyUri}; use crate::{hmacutil, util}; diff --git a/src/cmd_signjwtsoft.rs b/src/cmd_sign_jwt_soft.rs similarity index 98% rename from src/cmd_signjwtsoft.rs rename to src/cmd_sign_jwt_soft.rs index de3488f..f6daf2d 100644 --- a/src/cmd_signjwtsoft.rs +++ b/src/cmd_sign_jwt_soft.rs @@ -6,7 +6,7 @@ use rust_util::util_clap::{Command, CommandError}; use rust_util::{util_msg, XResult}; use serde_json::{Map, Value}; -use crate::cmd_signjwt::{build_jwt_parts, merge_header_claims, merge_payload_claims}; +use crate::cmd_sign_jwt::{build_jwt_parts, merge_header_claims, merge_payload_claims}; use crate::keychain::{KeychainKey, KeychainKeyValue}; use crate::{digest, ecdsautil, hmacutil, keychain, rsautil, util}; diff --git a/src/cmd_sshagent.rs b/src/cmd_ssh_agent.rs similarity index 100% rename from src/cmd_sshagent.rs rename to src/cmd_ssh_agent.rs diff --git a/src/cmd_sshparse.rs b/src/cmd_ssh_parse.rs similarity index 100% rename from src/cmd_sshparse.rs rename to src/cmd_ssh_parse.rs diff --git a/src/cmd_sshparsesign.rs b/src/cmd_ssh_parse_sign.rs similarity index 100% rename from src/cmd_sshparsesign.rs rename to src/cmd_ssh_parse_sign.rs diff --git a/src/cmd_sshpivcert.rs b/src/cmd_ssh_piv_cert.rs similarity index 100% rename from src/cmd_sshpivcert.rs rename to src/cmd_ssh_piv_cert.rs diff --git a/src/cmd_sshpivsign.rs b/src/cmd_ssh_piv_sign.rs similarity index 100% rename from src/cmd_sshpivsign.rs rename to src/cmd_ssh_piv_sign.rs diff --git a/src/cmd_sshpubkey.rs b/src/cmd_ssh_pub_key.rs similarity index 100% rename from src/cmd_sshpubkey.rs rename to src/cmd_ssh_pub_key.rs diff --git a/src/cmd_u2fregister.rs b/src/cmd_u2f_register.rs similarity index 100% rename from src/cmd_u2fregister.rs rename to src/cmd_u2f_register.rs diff --git a/src/cmd_u2fsign.rs b/src/cmd_u2f_sign.rs similarity index 100% rename from src/cmd_u2fsign.rs rename to src/cmd_u2f_sign.rs diff --git a/src/main.rs b/src/main.rs index 44391f3..610317a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,11 +6,11 @@ use rust_util::util_clap::{Command, CommandError}; mod argsutil; mod cmd_chall; -mod cmd_challconfig; -mod cmd_ecverify; +mod cmd_chall_config; +mod cmd_ec_verify; mod cmd_hmac_sha1; -mod cmd_hmacencrypt; -mod cmd_hmacdecrypt; +mod cmd_hmac_encrypt; +mod cmd_hmac_decrypt; mod cmd_list; #[cfg(feature = "with-sequoia-openpgp")] mod cmd_pgp; @@ -22,37 +22,37 @@ mod cmd_pgpcardlist; mod cmd_pgpcardmake; mod cmd_pgpcardsign; mod cmd_piv; -mod cmd_pivdecrypt; -mod cmd_pivecdh; -mod cmd_pivecsign; -mod cmd_pivgenerate; -mod cmd_pivmeta; -mod cmd_pivrsasign; -mod cmd_pivsummary; -mod cmd_pivverify; -mod cmd_rsadecrypt; -mod cmd_rsaencrypt; -mod cmd_rsaverify; +mod cmd_piv_decrypt; +mod cmd_piv_ecdh; +mod cmd_piv_ecsign; +mod cmd_piv_generate; +mod cmd_piv_meta; +mod cmd_piv_rsasign; +mod cmd_piv_summary; +mod cmd_piv_verify; +mod cmd_rsa_decrypt; +mod cmd_rsa_encrypt; +mod cmd_rsa_verify; mod cmd_se; mod cmd_se_ecdh; mod cmd_se_ecsign; mod cmd_se_generate; mod cmd_se_recover; -mod cmd_filesign; -mod cmd_signjwt; -mod cmd_signjwtsoft; -mod cmd_signjwtse; -mod cmd_sshagent; -mod cmd_sshparse; -mod cmd_sshparsesign; -mod cmd_sshpivcert; -mod cmd_sshpivsign; -mod cmd_sshpubkey; -mod cmd_u2fregister; -mod cmd_u2fsign; -mod cmd_fileverify; +mod cmd_file_sign; +mod cmd_sign_jwt; +mod cmd_sign_jwt_soft; +mod cmd_sign_jwt_se; +mod cmd_ssh_agent; +mod cmd_ssh_parse; +mod cmd_ssh_parse_sign; +mod cmd_ssh_piv_cert; +mod cmd_ssh_piv_sign; +mod cmd_ssh_pub_key; +mod cmd_u2f_register; +mod cmd_u2f_sign; +mod cmd_file_verify; mod cmd_parseecdsasignature; -mod cmd_generatekeypair; +mod cmd_keypair_generate; mod digest; mod ecdhutil; mod ecdsautil; @@ -99,12 +99,12 @@ fn inner_main() -> CommandError { Box::new(cmd_list::CommandImpl), Box::new(cmd_chall::CommandImpl), Box::new(cmd_hmac_sha1::CommandImpl), - Box::new(cmd_hmacencrypt::CommandImpl), - Box::new(cmd_hmacdecrypt::CommandImpl), - Box::new(cmd_challconfig::CommandImpl), - Box::new(cmd_rsaencrypt::CommandImpl), - Box::new(cmd_rsadecrypt::CommandImpl), - Box::new(cmd_rsaverify::CommandImpl), + Box::new(cmd_hmac_encrypt::CommandImpl), + Box::new(cmd_hmac_decrypt::CommandImpl), + Box::new(cmd_chall_config::CommandImpl), + Box::new(cmd_rsa_encrypt::CommandImpl), + Box::new(cmd_rsa_decrypt::CommandImpl), + Box::new(cmd_rsa_verify::CommandImpl), #[cfg(feature = "with-sequoia-openpgp")] Box::new(cmd_pgp::CommandImpl), Box::new(cmd_pgpcardadmin::CommandImpl), @@ -114,36 +114,36 @@ fn inner_main() -> CommandError { #[cfg(feature = "with-sequoia-openpgp")] Box::new(cmd_pgpcardmake::CommandImpl), Box::new(cmd_piv::CommandImpl), - Box::new(cmd_pivsummary::CommandImpl), - Box::new(cmd_pivmeta::CommandImpl), - Box::new(cmd_pivverify::CommandImpl), - Box::new(cmd_pivrsasign::CommandImpl), - Box::new(cmd_pivecdh::CommandImpl), - Box::new(cmd_pivecsign::CommandImpl), - Box::new(cmd_pivdecrypt::CommandImpl), - Box::new(cmd_pivgenerate::CommandImpl), - Box::new(cmd_u2fregister::CommandImpl), - Box::new(cmd_u2fsign::CommandImpl), - Box::new(cmd_sshagent::CommandImpl), - Box::new(cmd_sshparsesign::CommandImpl), - Box::new(cmd_sshpivsign::CommandImpl), - Box::new(cmd_sshpivcert::CommandImpl), - Box::new(cmd_sshpubkey::CommandImpl), - Box::new(cmd_sshparse::CommandImpl), + Box::new(cmd_piv_summary::CommandImpl), + Box::new(cmd_piv_meta::CommandImpl), + Box::new(cmd_piv_verify::CommandImpl), + Box::new(cmd_piv_rsasign::CommandImpl), + Box::new(cmd_piv_ecdh::CommandImpl), + Box::new(cmd_piv_ecsign::CommandImpl), + Box::new(cmd_piv_decrypt::CommandImpl), + Box::new(cmd_piv_generate::CommandImpl), + Box::new(cmd_u2f_register::CommandImpl), + Box::new(cmd_u2f_sign::CommandImpl), + Box::new(cmd_ssh_agent::CommandImpl), + Box::new(cmd_ssh_parse_sign::CommandImpl), + Box::new(cmd_ssh_piv_sign::CommandImpl), + Box::new(cmd_ssh_piv_cert::CommandImpl), + Box::new(cmd_ssh_pub_key::CommandImpl), + Box::new(cmd_ssh_parse::CommandImpl), Box::new(cmd_pgpageaddress::CommandImpl), - Box::new(cmd_signjwt::CommandImpl), - Box::new(cmd_signjwtsoft::CommandImpl), - Box::new(cmd_signjwtse::CommandImpl), - Box::new(cmd_filesign::CommandImpl), - Box::new(cmd_fileverify::CommandImpl), + Box::new(cmd_sign_jwt::CommandImpl), + Box::new(cmd_sign_jwt_soft::CommandImpl), + Box::new(cmd_sign_jwt_se::CommandImpl), + Box::new(cmd_file_sign::CommandImpl), + Box::new(cmd_file_verify::CommandImpl), Box::new(cmd_se::CommandImpl), Box::new(cmd_se_generate::CommandImpl), Box::new(cmd_se_recover::CommandImpl), Box::new(cmd_se_ecsign::CommandImpl), Box::new(cmd_se_ecdh::CommandImpl), - Box::new(cmd_ecverify::CommandImpl), + Box::new(cmd_ec_verify::CommandImpl), Box::new(cmd_parseecdsasignature::CommandImpl), - Box::new(cmd_generatekeypair::CommandImpl), + Box::new(cmd_keypair_generate::CommandImpl), ]; #[allow(clippy::vec_init_then_push)]