X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=inline;f=tfcrypt.c;h=01173fb691a214f7e666fb0f48552072b4c59756;hb=0b911d4a813fe164d62ef6ef132c5a4f9a441d57;hp=4724c0fab024cf88ab10fa8492dfce05c0cbeb76;hpb=e0d3bb48cd0cd079f9d1bd5555a52f450db452ac;p=tfcrypt.git

diff --git a/tfcrypt.c b/tfcrypt.c
index 4724c0f..01173fb 100644
--- a/tfcrypt.c
+++ b/tfcrypt.c
@@ -62,9 +62,22 @@ int main(int argc, char **argv)
 
 	if (!isatty(2)) do_statline_dynamic = NO;
 
+	s = (char *)srcblk;
+	d = getenv("HOME");
+	if (!d) d = "";
+	n = PATH_MAX > sizeof(srcblk) ? sizeof(srcblk) : PATH_MAX;
+	if (xstrlcpy(s, d, n) >= n) goto _baddfname;
+	if (xstrlcat(s, "/.tfcrypt.defs", n) >= n) goto _baddfname;
+	read_defaults(s, YES);
+_baddfname:
+	memset(s, 0, n);
+
 	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;
@@ -78,6 +91,8 @@ int main(int argc, char **argv)
 					counter_opt = TFC_CTR_HEAD;
 				else if (!strcasecmp(optarg, "rand"))
 					counter_opt = TFC_CTR_RAND;
+				else if (!strcasecmp(optarg, "zero"))
+					counter_opt = TFC_CTR_ZERO;
 				else counter_file = sksum_hashlist_file = optarg;
 				break;
 			case 'C':
@@ -907,8 +922,6 @@ _xts2genkey:	if (xwrite(krfd, pblk, TF_FROM_BITS(TFC_KEY_BITS)) == NOSIZE) xerro
 	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) {
@@ -918,6 +931,7 @@ _xts2genkey:	if (xwrite(krfd, pblk, TF_FROM_BITS(TFC_KEY_BITS)) == NOSIZE) xerro
 			}
 			break;
 		case TFC_CTR_RAND: tfc_getrandom(ctr, ctrsz); break;
+		case TFC_CTR_ZERO: memset(ctr, 0, ctrsz); break;
 	}
 
 _ctrskip2:
@@ -990,6 +1004,8 @@ _ctrwagain:	lio = xwrite(dfd, pblk, lrem);
 		delta_processed += ldone;
 	}
 
+	if (ctr_mode == TFC_MODE_STREAM) tfe_init_iv(&tfe, key, ctr);
+
 	errno = 0;
 	do_stop = NO;
 	while (1) {