X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.h;h=e9aedd61ccb3de5e4dc2f2e547d881c35e7f3764;hb=e0e605e37f6a5bd6ab8a19b490f579f8ba07eea6;hp=a313b33d142fe8b5629f669aa4161acc0d0b2110;hpb=0303cbcec2b262cc3dcf8d89951967d7ba9543c7;p=tfcrypt.git diff --git a/tfcrypt.h b/tfcrypt.h index a313b33..e9aedd6 100644 --- a/tfcrypt.h +++ b/tfcrypt.h @@ -139,7 +139,7 @@ extern tfc_byte macvrfy[SKEIN_DIGEST_SIZE], macresult[SKEIN_DIGEST_SIZE]; extern tfc_byte tmpdata[TFC_TMPSIZE]; extern char *randsource; extern tfc_fsize iseek_blocks, iseek, oseek, maxlen, ftrunc_dfd; -extern tfc_fsize total_processed_src, total_processed_dst; +extern tfc_fsize total_processed_src, total_processed_dst, total_written_dst; extern tfc_fsize delta_processed; extern tfc_fsize genrandom_nr_bytes, genzero_nr_bytes; extern tfc_fsize rdpos; @@ -155,7 +155,7 @@ extern size_t sksum_turns; extern int do_edcrypt, do_stop, quiet, error_action; extern int counter_opt, mackey_opt, do_mac, do_outfmt, rawkey; extern int idx, write_flags; -extern tfc_yesno catch_all_errors, ignore_seek_errors, password, overwrite_source, do_fsync, do_pad; +extern tfc_yesno catch_all_errors, ignore_seek_errors, password, overwrite_source, do_fsync, do_pad, do_ftrunc; extern tfc_yesno do_preserve_time, do_stats_in_gibs, do_statline_dynamic, do_less_stats; extern tfc_yesno no_repeat, do_full_hexdump, verbose, statline_was_shown, show_secrets; extern char *srcfname, *dstfname, *do_mac_file, *counter_file, *sksum_hashlist_file; @@ -200,6 +200,7 @@ void hex2bin(void *d, const char *s); void tfc_finirandom(void); void tfc_getrandom(void *buf, size_t sz); void exit_sigterm(int signal); +void handle_sigtstp(int signal); void print_crypt_status(int signal); void change_status_width(int signal); void change_status_timer(int signal); @@ -218,9 +219,8 @@ void do_benchmark(tfc_useconds useconds, double dseconds); enum { NO, YES }; enum { TFC_ERRACT_EXIT, TFC_ERRACT_CONT, TFC_ERRACT_SYNC, TFC_ERRACT_LSYNC }; -enum { TFC_STOP_BEGAN = 1, TFC_STOP_FULL }; enum { TFC_DO_PLAIN, TFC_DO_ENCRYPT, TFC_DO_DECRYPT }; -enum { TFC_MAC_DROP = -1, TFC_MAC_SIGN = 1, TFC_MAC_VRFY, TFC_MAC_JUST_VRFY }; +enum { TFC_MAC_DROP = -1, TFC_MAC_SIGN = 1, TFC_MAC_VRFY, TFC_MAC_JUST_VRFY, TFC_MAC_JUST_VRFY2 }; enum { TFC_MACKEY_RAWKEY = 1, TFC_MACKEY_PASSWORD, TFC_MACKEY_FILE }; enum { TFC_RAWKEY_KEYFILE = 1, TFC_RAWKEY_ASKSTR, TFC_RAWKEY_ASKHEX }; enum { TFC_OUTFMT_HEX = 1, TFC_OUTFMT_B64, TFC_OUTFMT_RAW }; @@ -229,5 +229,6 @@ enum { TFC_MODE_STREAM, TFC_MODE_XTS, TFC_MODE_ECB, TFC_MODE_CBC, TFC_MODE_OCB }; enum { TFC_CTR_SHOW = 1, TFC_CTR_HEAD, TFC_CTR_RAND, TFC_CTR_ZERO, TFC_CTR_SSET }; +enum { TFC_NO_FTRUNC, TFC_DO_FTRUNC, TFC_FTRUNC_TAIL }; #endif