X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.h;h=85ed79a5890f4f142d2a828f607586ebe68394b8;hb=c0dc5614a87ed6d0eed4906447171ef4c73b306e;hp=e8bee1a12e5965acb007bf982c0f460dbce85fb9;hpb=7843812e68ebd194667b244cdd6f6cbd45beb3a5;p=tfcrypt.git diff --git a/tfcrypt.h b/tfcrypt.h index e8bee1a..85ed79a 100644 --- a/tfcrypt.h +++ b/tfcrypt.h @@ -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: * @@ -155,14 +155,14 @@ 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; extern char *saltf, *genkeyf, *mackeyf, *tweakf; extern char *pw_prompt, *mac_pw_prompt; extern tfc_useconds status_timer, bench_timer; -extern tfc_useconds current_time, delta_time; +extern tfc_useconds total_time, current_time, delta_time; extern struct getpasswd_state getps; size_t xread(int fd, void *data, size_t szdata); @@ -188,6 +188,7 @@ tfc_yesno str_empty(const char *str); void xclose(int fd); const char *tfc_modename(int mode); void tfc_getcurtime(tfc_useconds *tx); +char *tfc_format_time(tfc_useconds t); tfc_fsize tfc_fdsize(int fd); tfc_fsize tfc_fdgetpos(int fd); tfc_fsize tfc_fnamesize(char *fname, tfc_yesno noexit); @@ -228,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