X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.c;h=8608cf16011399202e66f08b8855211c6368a56e;hb=429747d78e7e60b3dc44fd8b23f1626c386663e0;hp=dcf9ea98c394e8405cad36b55752c70ea15dfc35;hpb=efa545d64b910923248233618e774ca3b87efebb;p=tfcrypt.git

diff --git a/tfcrypt.c b/tfcrypt.c
index dcf9ea9..8608cf1 100644
--- a/tfcrypt.c
+++ b/tfcrypt.c
@@ -63,8 +63,11 @@ int main(int argc, char **argv)
 	if (!isatty(2)) do_statline_dynamic = NO;
 
 	opterr = 0;
-	while ((c = getopt(argc, argv, "aU:C:r:K:t:TPkzxc:l:qedn:vV:pwE:O:S:AmM:R:Z:WHD:")) != -1) {
+	while ((c = getopt(argc, argv, "s:aU:C:r:K:t:TPkzxc:l:qedn:vV:pwE:O:S:AmM:R:Z:WHD:")) != -1) {
 		switch (c) {
+			case 's':
+				saltf = optarg;
+				break;
 			case 'r':
 				randsource = optarg;
 				break;
@@ -143,6 +146,7 @@ int main(int argc, char **argv)
 				tweakf = optarg;
 				break;
 			case 'T':
+				tfc_saltsz = 0;
 				do_tfcrypt1 = YES;
 				break;
 			case 'l':
@@ -173,6 +177,8 @@ int main(int argc, char **argv)
 					error_action = TFC_ERRACT_CONT;
 				else if (!strcmp(optarg, "sync"))
 					error_action = TFC_ERRACT_SYNC;
+				else if (!strcmp(optarg, "lsync"))
+					error_action = TFC_ERRACT_LSYNC;
 				else xerror(NO, YES, YES, "invalid error action %s specified", optarg);
 				break;
 			case 'O':
@@ -466,6 +472,23 @@ int main(int argc, char **argv)
 	errno = 0;
 	do_stop = NO;
 
+	if (saltf) {
+		int saltfd;
+
+		memset(tfc_salt, 0, TFC_MAX_SALT);
+		tfc_saltsz = 0;
+		if (!strcasecmp(saltf, "disable")) goto _nosalt;
+
+		if (!strcmp(saltf, "-")) saltfd = 0;
+		else saltfd = open(saltf, O_RDONLY | O_LARGEFILE);
+		if (saltfd == -1) xerror(NO, NO, YES, "%s", saltf);
+		lio = xread(saltfd, tfc_salt, TFC_MAX_SALT - TF_FROM_BITS(TFC_KEY_BITS));
+		if (lio == NOSIZE) xerror(NO, NO, YES, "%s", saltf);
+		tfc_saltsz = lio;
+		xclose(saltfd);
+	}
+
+_nosalt:
 	if (mackey_opt == TFC_MACKEY_FILE && mackeyf) {
 		int mkfd = -1;
 		tfc_yesno do_stop;
@@ -482,7 +505,8 @@ int main(int argc, char **argv)
 			pblk = tmpdata;
 			ldone = 0;
 			lrem = lblock = sizeof(tmpdata);
-_mkragain:		lio = read(mkfd, pblk, lrem);
+			if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(mkfd);
+_mkragain:		lio = xread(mkfd, pblk, lrem);
 			if (lio == 0) do_stop = YES;
 			if (lio != NOSIZE) ldone += lio;
 			else {
@@ -491,10 +515,12 @@ _mkragain:		lio = read(mkfd, pblk, lrem);
 				switch (error_action) {
 					case TFC_ERRACT_CONT: xerror(YES, NO, NO, "%s", mackeyf); goto _mkragain; break;
 					case TFC_ERRACT_SYNC:
+					case TFC_ERRACT_LSYNC:
 						xerror(YES, NO, NO, "%s", mackeyf);
 						lio = ldone = lrem = lblock;
 						memset(tmpdata, 0, lio);
-						lseek(mkfd, lio, SEEK_CUR);
+						if (rdpos == NOFSIZE) lseek(mkfd, lio, SEEK_CUR);
+						else lseek(mkfd, rdpos + lio, SEEK_SET);
 						break;
 					default: xerror(NO, NO, NO, "%s", mackeyf); break;
 				}
@@ -567,7 +593,7 @@ _mkragain:		lio = read(mkfd, pblk, lrem);
 		if (!strcmp(tweakf, "-")) twfd = 0;
 		else twfd = open(tweakf, O_RDONLY | O_LARGEFILE);
 		if (twfd == -1) xerror(NO, NO, YES, "%s", tweakf);
-		lio = ldone = read(twfd, key+TF_FROM_BITS(TF_MAX_BITS)+TF_SIZE_UNIT, 2*TF_SIZE_UNIT);
+		lio = ldone = xread(twfd, key+TF_FROM_BITS(TF_MAX_BITS)+TF_SIZE_UNIT, 2*TF_SIZE_UNIT);
 		if (lio == NOSIZE) xerror(NO, NO, YES, "%s", tweakf);
 		if (ldone < 2*TF_SIZE_UNIT)
 			xerror(NO, NO, YES, "%s: %zu bytes tweak required", tweakf, 2*TF_SIZE_UNIT);
@@ -616,7 +642,7 @@ _nokeyfd:
 		if (!strcmp(counter_file, "-")) ctrfd = 0;
 		else ctrfd = open(counter_file, O_RDONLY | O_LARGEFILE);
 		if (ctrfd == -1) xerror(NO, NO, YES, "%s", counter_file);
-		lio = read(ctrfd, ctr, ctrsz);
+		lio = xread(ctrfd, ctr, ctrsz);
 		if (lio == NOSIZE) xerror(NO, NO, YES, "%s", counter_file);
 		if (lio < ctrsz) xerror(NO, YES, YES, "counter file is too small (%zu)!", lio);
 		xclose(ctrfd);
@@ -625,7 +651,8 @@ _nokeyfd:
 		pblk = ctr;
 		ldone = 0;
 		lrem = lblock = ctrsz;
-_ctrragain:	lio = read(sfd, pblk, lrem);
+		if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(sfd);
+_ctrragain:	lio = xread(sfd, pblk, lrem);
 		if (lio != NOSIZE) ldone += lio;
 		else {
 			if (errno != EIO && catch_all_errors != YES)
@@ -633,10 +660,12 @@ _ctrragain:	lio = read(sfd, pblk, lrem);
 			switch (error_action) {
 				case TFC_ERRACT_CONT: xerror(YES, NO, NO, "%s", srcfname); goto _ctrragain; break;
 				case TFC_ERRACT_SYNC:
+				case TFC_ERRACT_LSYNC:
 					xerror(YES, NO, NO, "%s", srcfname);
 					lio = ldone = lrem = lblock;
 					memset(ctr, 0, lio);
-					lseek(sfd, lio, SEEK_CUR);
+					if (rdpos == NOFSIZE) lseek(sfd, lio, SEEK_CUR);
+					else lseek(sfd, rdpos + lio, SEEK_SET);
 					break;
 				default: xerror(NO, NO, NO, "%s", srcfname); break;
 			}
@@ -667,7 +696,8 @@ _ctrskip1:
 		pblk = key;
 _xts2key:	ldone = 0;
 		lrem = lblock = TF_FROM_BITS(TFC_KEY_BITS);
-_keyragain:	lio = read(kfd, pblk, lrem);
+		if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(kfd);
+_keyragain:	lio = xread(kfd, pblk, lrem);
 		if (lio != NOSIZE) ldone += lio;
 		else {
 			if (errno != EIO && catch_all_errors != YES)
@@ -675,10 +705,12 @@ _keyragain:	lio = read(kfd, pblk, lrem);
 			switch (error_action) {
 				case TFC_ERRACT_CONT: xerror(YES, NO, NO, "reading key"); goto _keyragain; break;
 				case TFC_ERRACT_SYNC:
+				case TFC_ERRACT_LSYNC:
 					xerror(YES, NO, NO, "reading key");
 					lio = ldone = lrem = lblock;
 					memset(key, 0, lio);
-					lseek(kfd, lio, SEEK_CUR);
+					if (rdpos == NOFSIZE) lseek(kfd, lio, SEEK_CUR);
+					else lseek(kfd, rdpos + lio, SEEK_SET);
 					break;
 				default: xerror(NO, NO, NO, "reading key"); break;
 			}
@@ -786,9 +818,14 @@ _pwdagain:	memset(&getps, 0, sizeof(struct getpasswd_state));
 			xerror(NO, NO, YES, "hashing key");
 	}
 
-	if (nr_turns > 1 && rawkey == NO) {
-		for (x = 0; x < nr_turns; x++)
+	if (rawkey == NO) {
+		if (tfc_saltsz > 0) {
+			memcpy(tfc_salt+tfc_saltsz, key, TF_FROM_BITS(TFC_KEY_BITS));
+			skein(key, TFC_KEY_BITS, mackey_opt ? mackey : NULL, tfc_salt, tfc_saltsz+TF_FROM_BITS(TFC_KEY_BITS));
+		}
+		if (nr_turns > 1) for (x = 0; x < nr_turns; x++)
 			skein(key, TFC_KEY_BITS, mackey_opt ? mackey : NULL, key, TF_FROM_BITS(TFC_KEY_BITS));
+		memset(tfc_salt, 0, TFC_MAX_SALT);
 	}
 
 	if (ctr_mode == TFC_MODE_XTS && rawkey == NO) {
@@ -803,7 +840,7 @@ _pwdagain:	memset(&getps, 0, sizeof(struct getpasswd_state));
 		if (!strcmp(genkeyf, "-")) krfd = 1;
 		else krfd = open(genkeyf, O_WRONLY | O_CREAT | O_LARGEFILE | write_flags, 0666);
 		if (krfd == -1) xerror(NO, NO, YES, "%s", genkeyf);
-_xts2genkey:	if (write(krfd, pblk, TF_FROM_BITS(TFC_KEY_BITS)) == -1) xerror(NO, NO, YES, "%s", genkeyf);
+_xts2genkey:	if (xwrite(krfd, pblk, TF_FROM_BITS(TFC_KEY_BITS)) == NOSIZE) xerror(NO, NO, YES, "%s", genkeyf);
 		if (do_fsync && fsync(krfd) == -1) xerror(NO, NO, YES, "%s", genkeyf);
 		if (verbose && xtskeyset == NO) {
 			tfc_esay("%s: password hashing done", progname);
@@ -859,8 +896,8 @@ _xts2genkey:	if (write(krfd, pblk, TF_FROM_BITS(TFC_KEY_BITS)) == -1) xerror(NO,
 		case TFC_CTR_SHOW:
 			switch (do_outfmt) {
 				case TFC_OUTFMT_B64: tfc_printbase64(stderr, ctr, ctrsz, YES); break;
-				case TFC_OUTFMT_RAW: write(2, ctr, ctrsz); break;
-				case TFC_OUTFMT_HEX: mhexdump(ctr, ctrsz, ctrsz, YES); break;
+				case TFC_OUTFMT_RAW: xwrite(2, ctr, ctrsz); break;
+				case TFC_OUTFMT_HEX: mehexdump(ctr, ctrsz, ctrsz, YES); break;
 			}
 			break;
 		case TFC_CTR_RAND: tfc_getrandom(ctr, ctrsz); break;
@@ -923,7 +960,7 @@ _plain:
 		pblk = ctr;
 		lio = lrem = ctrsz;
 		ldone = 0;
-_ctrwagain:	lio = write(dfd, pblk, lrem);
+_ctrwagain:	lio = xwrite(dfd, pblk, lrem);
 		if (lio != NOSIZE) ldone += lio;
 		else xerror(NO, NO, NO, "%s", dstfname);
 		if (do_fsync && fsync(dfd) == -1) xerror(NO, NO, NO, "%s", dstfname);
@@ -943,7 +980,8 @@ _ctrwagain:	lio = write(dfd, pblk, lrem);
 		pblk = srcblk;
 		ldone = 0;
 		lrem = lblock = blk_len_adj(maxlen, total_processed_src, blksize);
-_ragain:	lio = read(sfd, pblk, lrem);
+		if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(sfd);
+_ragain:	lio = xread(sfd, pblk, lrem);
 		if (lio == 0) do_stop = TFC_STOP_BEGAN;
 		if (lio != NOSIZE) ldone += lio;
 		else {
@@ -952,10 +990,12 @@ _ragain:	lio = read(sfd, pblk, lrem);
 			switch (error_action) {
 				case TFC_ERRACT_CONT: xerror(YES, NO, NO, "%s", srcfname); goto _ragain; break;
 				case TFC_ERRACT_SYNC:
+				case TFC_ERRACT_LSYNC:
 					xerror(YES, NO, NO, "%s", srcfname);
 					lio = ldone = lrem = lblock;
 					memset(srcblk, 0, lio);
-					lseek(sfd, lio, SEEK_CUR);
+					if (rdpos == NOFSIZE) lseek(sfd, lio, SEEK_CUR);
+					else lseek(sfd, rdpos + lio, SEEK_SET);
 					break;
 				default: xerror(NO, NO, NO, "%s", srcfname); break;
 			}
@@ -1007,7 +1047,7 @@ _ragain:	lio = read(sfd, pblk, lrem);
 		pblk = dstblk;
 		lrem = ldone;
 		ldone = 0;
-_wagain:	lio = write(dfd, pblk, lrem);
+_wagain:	lio = xwrite(dfd, pblk, lrem);
 		if (lio != NOSIZE) ldone += lio;
 		else xerror(NO, NO, NO, "%s", dstfname);
 		if (do_fsync && fsync(dfd) == -1) xerror(NO, NO, NO, "%s", dstfname);
@@ -1030,7 +1070,8 @@ _nowrite:	total_processed_dst += ldone;
 			pblk = macvrfy;
 			ldone = 0;
 			lrem = lblock = TF_FROM_BITS(macbits);
-_macragain:		lio = read(sfd, pblk, lrem);
+			if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(sfd);
+_macragain:		lio = xread(sfd, pblk, lrem);
 			if (lio != NOSIZE) ldone += lio;
 			else {
 				if (errno != EIO && catch_all_errors != YES)
@@ -1038,10 +1079,12 @@ _macragain:		lio = read(sfd, pblk, lrem);
 				switch (error_action) {
 					case TFC_ERRACT_CONT: xerror(YES, NO, NO, "%s", srcfname); goto _macragain; break;
 					case TFC_ERRACT_SYNC:
+					case TFC_ERRACT_LSYNC:
 						xerror(YES, NO, NO, "%s", srcfname);
 						lio = ldone = lrem = lblock;
 						memset(macvrfy, 0, lio);
-						lseek(sfd, lio, SEEK_CUR);
+						if (rdpos == NOFSIZE) lseek(sfd, lio, SEEK_CUR);
+						else lseek(sfd, rdpos + lio, SEEK_SET);
 						break;
 					default: xerror(NO, NO, NO, "%s", srcfname); break;
 				}
@@ -1059,7 +1102,7 @@ _macragain:		lio = read(sfd, pblk, lrem);
 			if (!strcmp(do_mac_file, "-")) mfd = 0;
 			else mfd = open(do_mac_file, O_RDONLY | O_LARGEFILE);
 			if (mfd == -1) xerror(YES, NO, NO, "%s", do_mac_file);
-			lio = ldone = read(mfd, tmpdata, sizeof(tmpdata));
+			lio = ldone = xread(mfd, tmpdata, sizeof(tmpdata));
 			if (lio == NOSIZE) xerror(NO, NO, YES, "%s", do_mac_file);
 			if (!memcmp(tmpdata, TFC_ASCII_TFC_MAC_FOURCC, TFC_ASCII_TFC_MAC_FOURCC_LEN)) {
 				memmove(tmpdata, tmpdata+TFC_ASCII_TFC_MAC_FOURCC_LEN,
@@ -1093,7 +1136,7 @@ _macragain:		lio = read(sfd, pblk, lrem);
 				tfc_esay("%s: signature is good", progname);
 				if (verbose) {
 					if (do_outfmt == TFC_OUTFMT_B64) tfc_printbase64(stderr, macresult, TF_FROM_BITS(macbits), YES);
-					else mhexdump(macresult, TF_FROM_BITS(macbits), TF_FROM_BITS(macbits), YES);
+					else mehexdump(macresult, TF_FROM_BITS(macbits), TF_FROM_BITS(macbits), YES);
 				}
 			}
 		}
@@ -1124,7 +1167,7 @@ _shortmac:	memset(macvrfy, 0, sizeof(macvrfy));
 			pblk = tmpdata;
 			lio = lrem = TF_FROM_BITS(macbits);
 			ldone = 0;
-_macwagain:		lio = write(dfd, pblk, lrem);
+_macwagain:		lio = xwrite(dfd, pblk, lrem);
 			if (lio != NOSIZE) ldone += lio;
 			else xerror(NO, NO, NO, "%s", dstfname);
 			if (do_fsync && fsync(dfd) == -1) xerror(NO, NO, NO, "%s", dstfname);
@@ -1152,9 +1195,9 @@ _macwagain:		lio = write(dfd, pblk, lrem);
 					tmpdata[lrem] = '\n';
 					lrem++;
 				}
-				lio = write(mfd, tmpdata, lrem);
+				lio = xwrite(mfd, tmpdata, lrem);
 			}
-			else lio = write(mfd, tmpdata, TF_FROM_BITS(macbits));
+			else lio = xwrite(mfd, tmpdata, TF_FROM_BITS(macbits));
 			if (lio == NOSIZE) xerror(NO, NO, YES, "%s", do_mac_file);
 			if (do_fsync && fsync(mfd) == -1) xerror(NO, NO, YES, "%s", do_mac_file);
 			xclose(mfd);