diff --git a/utils/crypt_tool/main.cpp b/utils/crypt_tool/main.cpp index 6910b2fa..3cdaf680 100644 --- a/utils/crypt_tool/main.cpp +++ b/utils/crypt_tool/main.cpp @@ -7,14 +7,14 @@ using namespace PICoutManipulators; void usage() { piCout << Bold << "PIP Crypt Utility"; piCout << Cyan << "Version" << Bold << PIPVersion() << NewLine; - piCout << Green << Bold << "Usage:" << Default << "\"picrypt [-thr] [-g ] [-o ] [{[-c ] [-u ]} {[-p ] [-s ] [-k ] [-x ]}]\"" << NewLine; + piCout << Green << Bold << "Usage:" << Default << "\"picrypt [-thr] [-g ] [-o ] [{[-c ] [-d ]} {[-p ] [-s ] [-k ] [-x ]}]\"" << NewLine; piCout << Green << Bold << "Details:"; piCout << "-h --help " << Green << "- display this message and exit"; piCout << "-g --genhash " << Green << "- generate hash from string"; piCout << "-t --text " << Green << "- output in text base64"; piCout << "-o --out " << Green << "- write out to file "; piCout << "-c --crypt " << Green << "- crypt file using secret or or "; - piCout << "-u --uncrypt " << Green << "- uncrypt file using secret or or "; + piCout << "-d --decrypt " << Green << "- decrypt file using secret or or "; piCout << "-p --pass " << Green << "- use secret from passphrase "; piCout << "-s --secret " << Green << "- use secret from hash "; piCout << "-k --key " << Green << "- use secret from binary key_file "; @@ -30,7 +30,7 @@ int main (int argc, char * argv[]) { cli.addArgument("genhash", true); cli.addArgument("out", true); cli.addArgument("crypt", true); - cli.addArgument("uncrypt", true); + cli.addArgument("decrypt", true); cli.addArgument("pass", true); cli.addArgument("secret", true); cli.addArgument("key", true); @@ -41,7 +41,7 @@ int main (int argc, char * argv[]) { if (!(cli.hasArgument("genhash") || cli.hasArgument("crypt") || - cli.hasArgument("uncrypt") || + cli.hasArgument("decrypt") || cli.hasArgument("random")) || cli.hasArgument("help")) { usage(); @@ -61,7 +61,7 @@ int main (int argc, char * argv[]) { bout = crypt.hash(s); } else if (cli.hasArgument("random")) bout = crypt.generateKey(); - if (cli.hasArgument("crypt") || cli.hasArgument("uncrypt")) { + if (cli.hasArgument("crypt") || cli.hasArgument("decrypt")) { PIByteArray secret; if (cli.hasArgument("key")) { PIFile keyf(cli.argumentValue("key"), PIIODevice::ReadOnly); @@ -77,11 +77,11 @@ int main (int argc, char * argv[]) { PIByteArray bin; crypt.setKey(secret); if (cli.hasArgument("crypt")) in_file = cli.argumentValue("crypt"); - if (cli.hasArgument("uncrypt")) in_file = cli.argumentValue("uncrypt"); + if (cli.hasArgument("decrypt")) in_file = cli.argumentValue("decrypt"); if (inf.open(in_file, PIIODevice::ReadOnly)) { bin = inf.readAll(); if (cli.hasArgument("crypt")) bout = crypt.crypt(bin); - if (cli.hasArgument("uncrypt")) bout = crypt.decrypt(bin); + if (cli.hasArgument("decrypt")) bout = crypt.decrypt(bin); } else piCout << "error: while open input file"; } else piCout << "error: invalid secret"; }