X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_vars.c;h=498633425c722475543e0cf98533876245aabd0f;hb=add1a38544028f7f763b0ccf9ac354e8b45bec23;hp=7f78b84fad5b70222c3259bb1c725e5098a66608;hpb=87d683181cc464de9b1d48483b72533aa9166cd3;p=tfcrypt.git

diff --git a/tfc_vars.c b/tfc_vars.c
index 7f78b84..4986334 100644
--- a/tfc_vars.c
+++ b/tfc_vars.c
@@ -27,14 +27,11 @@
  */
 
 #include "tfcrypt.h"
+#include "tfcrypt_defs.h"
 
 char *progname;
 int exitcode;
 
-size_t nr_turns = TFC_NR_TURNS;
-int ctr_mode = TFC_CTR_MODE;
-size_t macbits = TF_MAX_BITS;
-
 tfc_byte key[TF_KEY_SIZE], ctr[TF_BLOCK_SIZE], xtskey[TF_KEY_SIZE], mackey[TF_FROM_BITS(TF_MAX_BITS)];
 struct skein sk;
 struct tfe_stream tfe;
@@ -67,7 +64,7 @@ tfc_yesno catch_all_errors, password, overwrite_source, do_fsync, do_pad, do_tfc
 tfc_yesno do_preserve_time, do_stats_in_gibs, do_statline_dynamic = YES, do_less_stats;
 tfc_yesno no_repeat, do_full_hexdump = YES, verbose, statline_was_shown;
 char *srcfname = TFC_STDIN_NAME, *dstfname = TFC_STDOUT_NAME, *do_mac_file, *counter_file, *sksum_hashlist_file;
-char *genkeyf, *mackeyf, *tweakf;
+char *saltf, *genkeyf, *mackeyf, *tweakf;
 char *pw_prompt, *mac_pw_prompt;
 tfc_useconds status_timer, bench_timer;
 tfc_useconds current_time, delta_time;