X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.c;h=2390516a2ae9b35d7b3715f82e8deb596d7d1c8b;hb=8b7f1839b1981554979af1aa2e5e8b58ad63fe77;hp=363e3c4825c8735dcae93c7e10cf338fbcb49056;hpb=630fb7d8dc740715cdc52114d736d64bf14f0798;p=tfcrypt.git

diff --git a/tfcrypt.c b/tfcrypt.c
index 363e3c4..2390516 100644
--- a/tfcrypt.c
+++ b/tfcrypt.c
@@ -62,9 +62,20 @@ int main(int argc, char **argv)
 
 	if (!isatty(2)) do_statline_dynamic = NO;
 
+	s = (char *)srcblk;
+	d = getenv("HOME");
+	if (!d) d = "";
+	xstrlcat(s, d, PATH_MAX > sizeof(srcblk) ? sizeof(srcblk) : PATH_MAX);
+	xstrlcat(s, "/.tfcrypt.defs", PATH_MAX > sizeof(srcblk) ? sizeof(srcblk) : PATH_MAX);
+	read_defaults(s, YES);
+	memset(s, 0, PATH_MAX > sizeof(srcblk) ? sizeof(srcblk) : PATH_MAX);
+
 	opterr = 0;
-	while ((c = getopt(argc, argv, "s:aU:C:r:K:t:TPkzxc:l:qedn:vV:pwE:O:S:AmM:R:Z:WHD:")) != -1) {
+	while ((c = getopt(argc, argv, "L:s:aU:C:r:K:t:TPkzxc:l:qedn:vV:pwE:O:S:AmM:R:Z:WHD:")) != -1) {
 		switch (c) {
+			case 'L':
+				read_defaults(optarg, NO);
+				break;
 			case 's':
 				saltf = optarg;
 				break;
@@ -903,11 +914,12 @@ _xts2genkey:	if (xwrite(krfd, pblk, TF_FROM_BITS(TFC_KEY_BITS)) == NOSIZE) xerro
 		if (!tweakf) skein(key+TF_FROM_BITS(TF_MAX_BITS)+TF_SIZE_UNIT, 2*TF_UNIT_BITS, NULL, key, TF_FROM_BITS(TFC_KEY_BITS));
 		tf_key_tweak_compat(key);
 	}
-	if (ctr_mode == TFC_MODE_STREAM) tfe_init_iv(&tfe, key, ctr);
 	if (ctr_mode == TFC_MODE_ECB) goto _ctrskip2;
 	tfc_data_to_words64(&iseek_blocks, sizeof(iseek_blocks));
 	tf_ctr_set(ctr, &iseek_blocks, sizeof(iseek_blocks));
 
+	if (ctr_mode == TFC_MODE_STREAM) tfe_init_iv(&tfe, key, ctr);
+
 	switch (counter_opt) {
 		case TFC_CTR_SHOW:
 			switch (do_outfmt) {