Replace ugly tweak size computation with explicit tweak clean API.

[tfcrypt.git] / tfc_error.c

diff --git a/tfc_error.c b/tfc_error.c
index 6e2dabf30f9a18cc99a6e9cd4ff37abe5b732cd3..53753674915966d88e635d8500fd723a23c9bd64 100644 (file)
--- 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,7 +152,7 @@ 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 defsults from file.");
+       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.");
@@ -171,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));