X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_error.c;h=4fd81f1eeb1c1ac24f172e0a9c5d60ce11d1a50a;hb=6a9ff11ac690fd5ffe09e0aa9398e00a54c2889c;hp=001273e1caed36d3b6b6730c73cd9980f2df4b69;hpb=26668913a55e867900ae7f80615640d814494e29;p=tfcrypt.git

diff --git a/tfc_error.c b/tfc_error.c
index 001273e..4fd81f1 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));
 
@@ -160,8 +161,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.");
@@ -171,6 +171,7 @@ void usage(void)
 	tfc_say("    show: do default action, then dump CTR value to stderr,");
 	tfc_say("    head: when decrypting, read CTR from beginning of stream,");
 	tfc_say("    rand: generate random CTR and write it to beginning of stream,");
+	tfc_say("    zero: assume zero CTR is used, do not read from and write it to stream,");
 	tfc_say("    <file>: read CTR from given file (both when encrypting/decrypting).");
 	tfc_say("      default is to derive CTR from user provided password or keyfile with");
 	tfc_say("      a single Skein function turn over derived, %u byte raw key", TFC_U(TF_KEY_SIZE));
@@ -257,6 +258,7 @@ void usage(void)
 	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.");