X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.h;h=67b4956cf83d8952289afdb3a4682d1161559d93;hb=96e6e88fd94af95e15d143e4a86d5a9e858d340d;hp=85ed79a5890f4f142d2a828f607586ebe68394b8;hpb=c0dc5614a87ed6d0eed4906447171ef4c73b306e;p=tfcrypt.git diff --git a/tfcrypt.h b/tfcrypt.h index 85ed79a..67b4956 100644 --- a/tfcrypt.h +++ b/tfcrypt.h @@ -61,6 +61,7 @@ #include #include #include +#include #include #include @@ -139,7 +140,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; @@ -200,6 +201,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 +220,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 };