X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.h;h=acc31df2b4a6e35a7339fb34c9fa9b6b3cbb0c99;hb=HEAD;hp=30e1a5108ffc4374c7827948d80a0e33e76c8806;hpb=d659ac85a7c63b7833ab793be2f37fbc4ca7ba6b;p=tfcrypt.git diff --git a/tfcrypt.h b/tfcrypt.h index 30e1a51..acc31df 100644 --- a/tfcrypt.h +++ b/tfcrypt.h @@ -170,8 +170,6 @@ extern struct getpasswd_state getps; size_t xread(int fd, void *data, size_t szdata); size_t xwrite(int fd, const void *data, size_t szdata); -extern tfc_yesno xexit_no_nl; - void xerror(tfc_yesno noexit, tfc_yesno noerrno, tfc_yesno nostats, const char *fmt, ...); void xexit(int status); void usage(void); @@ -193,6 +191,7 @@ int xxopen(tfc_yesno noerr, const char *pathname, int flags); int xopen(const char *pathname, int flags); void xclose(int fd); const char *tfc_modename(int mode); +tfc_yesno tfc_is_freestream(int mode); void tfc_getcurtime(tfc_useconds *tx); char *tfc_format_time(tfc_useconds t); char *tfc_format_pid(const char *str); @@ -232,10 +231,11 @@ 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 }; enum { - TFC_MODE_SKSUM = -2, TFC_MODE_PLAIN = -1, TFC_MODE_CTR = 1, - TFC_MODE_STREAM, TFC_MODE_XTS, TFC_MODE_ECB, TFC_MODE_CBC + TFC_MODE_SKSUM = -3, TFC_MODE_XOR = -2, TFC_MODE_PLAIN = -1, TFC_MODE_CTR = 1, + TFC_MODE_STREAM, TFC_MODE_XTS, TFC_MODE_ECB, TFC_MODE_CBC, TFC_MODE_PCBC }; 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 }; +enum { TFC_SIGLAST = -2, TFC_SIGERR = -1, TFC_SIGSTAT = 0 }; #endif