X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_error.c;h=905ae40213bb501be0089218718f38ed261cb0af;hb=3699c1f4ba441ce91f5fa674e73c3c4fa0264578;hp=11c22bbb12ec519812d1d5e0403249ae034ada59;hpb=4666ae1134223898de8012eca176625cc63a281f;p=tfcrypt.git diff --git a/tfc_error.c b/tfc_error.c index 11c22bb..905ae40 100644 --- a/tfc_error.c +++ b/tfc_error.c @@ -2,7 +2,7 @@ * tfcrypt -- high security Threefish encryption tool. * * tfcrypt is copyrighted: - * Copyright (C) 2012-2018 Andrey Rys. All rights reserved. + * Copyright (C) 2012-2019 Andrey Rys. All rights reserved. * * tfcrypt is licensed to you under the terms of std. MIT/X11 license: * @@ -91,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); } @@ -172,6 +176,11 @@ void usage(void) 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(" hexc:nr[,hexc:nr,...]: construct counter from given pattern."); + tfc_say(" Example: \"ff:124,08:2,80:2\" will fill counter first with 124 0xff bytes,"); + tfc_say(" then with 2 0x08 bytes, then 2 0x80 bytes. To fill with zeroes, it is"); + tfc_say(" simple to specify just a \"0:128\" as a pattern. Note that bytes that"); + tfc_say(" exceed CTR space will be just dropped, and any unused bytes are set to zeroes."); tfc_say(" : 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)); @@ -256,6 +265,7 @@ 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.");