X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_error.c;h=53753674915966d88e635d8500fd723a23c9bd64;hb=f402e6aa2dd18138ec26e9bfb340dae294637aec;hp=e1793fe0b5ed6e540886334bcb3a3e3272a10ff2;hpb=a7a8ae5408eed270854e69adf40ccaf3a401f830;p=tfcrypt.git

diff --git a/tfc_error.c b/tfc_error.c
index e1793fe..5375367 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));
 
@@ -151,6 +152,8 @@ void usage(void)
 	tfc_say("convert encrypted data into ASCII format to ease transmission.");
 	tfc_say("\n");
 	tfc_say("  -e, -d: encrypt, decrypt (it maybe required).");
+	tfc_say("  -L <file>: load tfcrypt defaults from file.");
+	tfc_say("    defaults is text file which defines salt, nr_turns and default mode.");
 	tfc_say("  -s <file>: load tfcrypt salt from file.");
 	tfc_say("  -s disable: disable key salting at all.");
 	tfc_say("  -p: instead of using key, ask for password.");
@@ -169,6 +172,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));
@@ -221,7 +225,8 @@ void usage(void)
 	tfc_say("      Note that both sync and lsync work only with read errors!");
 	tfc_say("  default error action is exit with printing status if not quiet.");
 	tfc_say("  -E xall: turn on error actions above for all errors, not just EIO errors.");
-	tfc_say("    This must be a separate option given before usual -E how option.");
+	tfc_say("  -E xseek: ignore positioning and other seek related errors.");
+	tfc_say("    Multiple -E specifiers may be given in separate options.");
 	tfc_say("  -O opts: set options (comma separated list):");
 	tfc_say("    sync: request a synchronous I/O for a output,");
 	tfc_say("    fsync: on each write() call a corresponding fsync(fd),");