X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_error.c;h=5729de0f42ff26ad18db6e37da6f81c4d4c7e934;hb=72672c5cb76597fdc07cbc9bc190394d1c1d3ee1;hp=b90b1087f659d4d656490c639b71586b713319ad;hpb=0b911d4a813fe164d62ef6ef132c5a4f9a441d57;p=tfcrypt.git

diff --git a/tfc_error.c b/tfc_error.c
index b90b108..5729de0 100644
--- a/tfc_error.c
+++ b/tfc_error.c
@@ -69,6 +69,7 @@ void xexit(int status)
 	memset(ctr, 0, sizeof(ctr));
 	memset(mackey, 0, sizeof(mackey));
 	memset(xtskey, 0, sizeof(xtskey));
+	memset(tweak, 0, sizeof(tweak));
 	memset(&sk, 0, sizeof(struct skein));
 	memset(&tfe, 0, sizeof(struct tfe_stream));
 
@@ -90,7 +91,11 @@ void usage(void)
 	tfc_yesno is_embedded_prog = NO;
 
 	if (optopt == 'V') {
+		char shash[64];
 		tfc_say("tfcrypt toolkit, version %s.", _TFCRYPT_VERSION);
+		hash_defaults(shash, sizeof(shash));
+		tfc_say("Defaults hash: %s", shash);
+		memset(shash, 0, sizeof(shash));
 		xexit(0);
 	}
 
@@ -160,8 +165,7 @@ void usage(void)
 	tfc_say("  -z: ask for key in plain C string form through password asker.");
 	tfc_say("  -x: ask for key in hex string form through password asker.");
 	tfc_say("  -K <file>: generate key from keyfile or password and write it to file.");
-	tfc_say("  -T: enable tfcrypt1 old mode (useful only for old encryptions).");
-	tfc_say("  -t <file>: use tweak from file (useful only for old encryptions).");
+	tfc_say("  -t <file>: use (raw) tweak from file.");
 	tfc_say("  -w: overwrite source file. If not file, ignored.");
 	tfc_say("  -n TURNS: number of turns to perform in Skein function.");
 	tfc_say("    Default is always defined when building tfcrypt.");
@@ -239,6 +243,7 @@ void usage(void)
 	tfc_say("    when the whole status line width is smaller than tty width.");
 	tfc_say("    statless: emit less information in status line (only processed data).");
 	tfc_say("    norepeat: do not ask for any possible password confirmations.");
+	tfc_say("    showsecrets: show passwords in plaintext instead of masking them.");
 	tfc_say("    prompt=str: set main password prompts to this string.");
 	tfc_say("    macprompt=str: set MAC password prompts to this string.");
 	tfc_say("    shorthex: with -H, do not print printable characters, dump only hex string.");
@@ -255,9 +260,11 @@ void usage(void)
 	tfc_say("    Internally this number is translated into number of %u byte blocks.", TFC_U(TF_BLOCK_SIZE));
 	tfc_say("    oseek=val: seek destination file/device by these val bytes.");
 	tfc_say("    count=val: process only these val bytes, both input and output.");
+	tfc_say("    ftrunc=val: truncate output file to these val bytes before closing it.");
 	tfc_say("    xkey=val: take only val bytes from user keyfile.");
 	tfc_say("    okey=val: seek the key before reading it (usually a device).");
 	tfc_say("    xctr=val: specify size in bytes of initial counter prepended or read.");
+	tfc_say("    fullkey: occupy tweak space by key space, extending key size by 256 bits.");
 	tfc_say("  -P: plain IO mode: disable encryption/decryption code at all.");
 	tfc_say("\n");
 	tfc_say("Default is to ask for password, then encrypt stdin into stdout.");