X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_error.c;h=b8cc4323b00e610768a5eaf2ce62039a27aaf8d1;hb=HEAD;hp=01cca1ac5c153247ae02b86cacbd31abec3cd7af;hpb=9ac86c906f37b9b9dce4f018c90d420f947e05a9;p=tfcrypt.git diff --git a/tfc_error.c b/tfc_error.c index 01cca1a..b8cc432 100644 --- a/tfc_error.c +++ b/tfc_error.c @@ -28,8 +28,6 @@ #include "tfcrypt.h" -tfc_yesno xexit_no_nl; - void xerror(tfc_yesno noexit, tfc_yesno noerrno, tfc_yesno nostats, const char *fmt, ...) { va_list ap; @@ -39,7 +37,7 @@ void xerror(tfc_yesno noexit, tfc_yesno noerrno, tfc_yesno nostats, const char * va_start(ap, fmt); - if (statline_was_shown == YES && do_statline_dynamic == YES) tfc_esay("\n"); + if (noexit == YES && (statline_was_shown == YES && do_statline_dynamic == YES)) tfc_esay("\n"); tfc_nfsay(stderr, "%s: ", tfc_format_pid(progname)); tfc_vfsay(stderr, NO, fmt, ap); @@ -52,12 +50,9 @@ void xerror(tfc_yesno noexit, tfc_yesno noerrno, tfc_yesno nostats, const char * va_end(ap); if (nostats == NO) { - print_crypt_status(-1); - tfc_esay("\n"); + print_crypt_status(TFC_SIGERR); } - xexit_no_nl = YES; - _do_sil_exit: if (noexit == YES) { errno = 0; @@ -102,7 +97,6 @@ _do_clean_and_exit: memset(pwdask, 0, sizeof(pwdask)); memset(pwdagain, 0, sizeof(pwdagain)); - if (xexit_no_nl == NO) tfc_esay("\n"); exit(status); } @@ -110,11 +104,9 @@ void usage(void) { tfc_yesno is_embedded_prog = NO; - xexit_no_nl = YES; - if (optopt == 'V') { tfc_say("tfcrypt toolkit, version %s.", _TFCRYPT_VERSION); - if (ctr_mode != TFC_MODE_PLAIN) { + if (do_edcrypt != TFC_DO_PLAIN) { char shash[64]; hash_defaults(shash, sizeof(shash)); @@ -148,6 +140,7 @@ void usage(void) tfc_say(" -a: shortcut of -O xtime."); tfc_say(" -l length: read only these first bytes of source."); tfc_say(" -O opts: set options (comma separated list):"); + tfc_say(" ro: open all files only for reading, even those intended for writing,"); tfc_say(" sync: request a synchronous I/O for a output,"); tfc_say(" fsync: on each write() call a corresponding fsync(fd),"); tfc_say(" trunc: open(O_WRONLY) will truncate output file to zero size."); @@ -161,8 +154,11 @@ 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(" iobs=val: set IO block size value. Must not exceed %u bytes.", TFC_U(TFC_BLKSIZE)); + tfc_say(" nobuf: disable IO buffering, write as soon as data received (only for stream ciphers!)"); tfc_say(" iseek=val: seek source file/device by these val bytes."); tfc_say(" oseek=val: seek destination file/device by these val bytes."); + tfc_say(" ioseek=val: seek both source and destination."); + tfc_say(" ioseek is equal to iseek and oseek."); 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(" ftrunc=tail: truncate output's tail, leaving only processed data."); @@ -196,7 +192,7 @@ void usage(void) tfc_say("them is specified as \"-\", then reads are performed from stdin."); tfc_say("\n"); } - else if (!strcmp(progname, "tfbase64")) { + else if (!strcmp(progname, "base64")) { is_embedded_prog = YES; tfc_say("usage: %s [-ed] [source] [output]", progname); tfc_say("\n"); @@ -206,6 +202,22 @@ void usage(void) tfc_say("no error checking is performed."); tfc_say("\n"); } + else if (!strcmp(progname, "xor")) { + is_embedded_prog = YES; + tfc_say("usage: %s [sourceX] [sourceY] [output]", progname); + tfc_say("\n"); + tfc_say("tfcrypt embedded high performance XOR tool."); + tfc_say("It does XOR (multiply modulo 2) of each byte from sourceX"); + tfc_say("each byte of sourceY and writes output."); + tfc_say("If filenames omitted, it is assumed to operate over"); + tfc_say("standard in to standard out."); + tfc_say("If any of source files is shorter than another,"); + tfc_say("then output is truncated to length of the shortest one."); + tfc_say("\n"); + tfc_say("No error checking is performed."); + tfc_say("Please use iotool options there."); + tfc_say("\n"); + } else if (!strcmp(progname, "tfbench")) { is_embedded_prog = YES; tfc_say("usage: %s seconds", progname); @@ -242,7 +254,7 @@ void usage(void) 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."); - tfc_say(" -C mode: mode of operation: CTR, STREAM, XTS, ECB, CBC, OCB."); + tfc_say(" -C mode: mode of operation: CTR, STREAM, XTS, ECB, CBC."); tfc_say(" Default encryption mode can be changed when building tfcrypt."); tfc_say(" -c opt: initial CTR value initialisation mode:"); tfc_say(" show: do default action, then dump CTR value to stderr,"); @@ -261,6 +273,8 @@ void usage(void) tfc_say(" -v: print number of read and written encrypted bytes, and explain stages."); tfc_say(" -V seconds: activate timer that will repeatedly print statistics to stderr."); tfc_say(" -a: shortcut of -O xtime."); + tfc_say(" -g: same as '-e -C stream -c rand' or '-d -C stream -c head', depending on mode."); + tfc_say(" -j: same as '-e -C ctr -c rand' or '-d -C ctr -c head', depending on mode."); tfc_say(" -l length: read only these first bytes of source."); tfc_say(" -r : specify random source instead of /dev/urandom."); tfc_say(" -R nr_bytes: generate nr_bytes of random bytes suitable for use as key data."); @@ -315,6 +329,7 @@ void usage(void) tfc_say(" Multiple -E specifiers may be given in separate options."); tfc_say(" -o logfile: redirect all messages to logfile instead of stderr."); tfc_say(" -O opts: set options (comma separated list):"); + tfc_say(" ro: open all files only for reading, even those intended for writing,"); tfc_say(" sync: request a synchronous I/O for a output,"); tfc_say(" fsync: on each write() call a corresponding fsync(fd),"); tfc_say(" trunc: open(O_WRONLY) will truncate output file to zero size."); @@ -337,6 +352,7 @@ void usage(void) tfc_say(" shorthex: with -H, do not print printable characters, dump only hex string."); tfc_say(" logfile: (same as -o) redirect all messages to logfile instead of stderr."); tfc_say(" iobs=val: set IO block size value. Must not exceed %u bytes.", TFC_U(TFC_BLKSIZE)); + tfc_say(" nobuf: disable IO buffering, write as soon as data received (only for stream ciphers!)"); tfc_say(" xtsblocks=val: use these nr of TF blocks per XTS block. Default is %u.", TFC_U(TFC_XTSBLOCKS)); tfc_say(" iseek=val: seek source file/device by these val bytes."); tfc_say(" Initial counter is adjusted automatically."); @@ -348,6 +364,8 @@ void usage(void) tfc_say(" ixctr=val: Increment initial counter by this val bytes."); 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(" ioseek=val: seek both source and destination."); + tfc_say(" ioseek is equal to iseek and oseek."); 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(" ftrunc=tail: truncate output's tail, leaving only processed data."); @@ -356,6 +374,7 @@ void usage(void) 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(" -X: XOR IO mode: same as -P but do XOR of two streams."); tfc_say("\n"); tfc_say("Default is to ask for password, then encrypt stdin into stdout."); tfc_say("Some cmdline parameters may be mutually exclusive, or they can");