X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.c;h=5630a391a6c1798393308d810599512645f9f69b;hb=92b6bb91a5be9fc1b4d300f99b239cb8e3a6398d;hp=4eb2b04cc5d620af0741ed66af20c1f7998d54e1;hpb=13cc886eb2edfe7be4e65067be6df01e2f08436a;p=tfcrypt.git

diff --git a/tfcrypt.c b/tfcrypt.c
index 4eb2b04..5630a39 100644
--- a/tfcrypt.c
+++ b/tfcrypt.c
@@ -29,6 +29,7 @@
 #include "tfcrypt.h"
 
 static tfc_byte svctr[TF_BLOCK_SIZE];
+static tfc_fsize rwd, do_read_loops, loopcnt;
 
 static void open_log(const char *logfile)
 {
@@ -129,8 +130,8 @@ int main(int argc, char **argv)
 	double td;
 	char *s, *d, *t, *stoi;
 	size_t x, n;
-	tfc_fsize rwd;
 
+	progpid = getpid();
 	progname = basename(argv[0]);
 
 	if (!isatty(2)) do_statline_dynamic = NO;
@@ -336,6 +337,12 @@ _baddfname:
 						show_secrets = YES;
 					else if (!strcmp(s, "finished"))
 						show_when_done = YES;
+					else if (!strcmp(s, "pid"))
+						show_pid = YES;
+					else if (!strncmp(s, "readloops", 9) && *(s+9) == '=') {
+						do_read_loops = tfc_humanfsize(s+10, &stoi);
+						if (!str_empty(stoi)) do_read_loops = NOSIZE;
+					}
 					else if (!strncmp(s, "logfile", 7) && *(s+7) == '=')
 						open_log(s+8);
 					else if (!strncmp(s, "iobs", 4) && *(s+4) == '=') {
@@ -573,6 +580,7 @@ _baddfname:
 				break;
 			case 'q':
 				quiet = YES;
+				xexit_no_nl = YES;
 				verbose = NO;
 				do_full_hexdump = NO;
 				status_timer = 0;
@@ -765,13 +773,7 @@ _nokeyfd:
 		}
 		if (sfd == -1) xerror(NO, NO, YES, "%s", argv[idx]);
 
-		if (do_edcrypt == TFC_DO_DECRYPT && do_mac != NO && maxlen != NOFSIZE) {
-			if (verbose) tfc_esay("%s: disabling signature verification on "
-				"requested partial decryption.", progname);
-			do_mac = NO;
-		}
-
-		if ((do_mac >= TFC_MAC_VRFY || do_mac == TFC_MAC_DROP) && !do_mac_file) {
+		if ((do_mac >= TFC_MAC_VRFY || do_mac <= TFC_MAC_DROP) && !do_mac_file) {
 			maxlen = tfc_fdsize(sfd);
 			if (maxlen == NOFSIZE)
 				xerror(NO, YES, YES,
@@ -842,7 +844,7 @@ _ctrskip1:
 
 	if (ctr_mode == TFC_MODE_PLAIN) goto _plain;
 
-	if (verbose) tfc_esay("%s: hashing password", progname);
+	if (verbose) tfc_esay("%s: hashing password", tfc_format_pid(progname));
 
 	if (rawkey == TFC_RAWKEY_KEYFILE) {
 		tfc_yesno xtskeyset = NO;
@@ -1000,9 +1002,9 @@ _pwdagain:	memset(&getps, 0, sizeof(struct getpasswd_state));
 _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);
-			tfc_esay("%s: rawkey written to %s.", progname, genkeyf);
-			tfc_esay("%s: Have a nice day!", progname);
+			tfc_esay("%s: password hashing done", tfc_format_pid(progname));
+			tfc_esay("%s: rawkey written to %s.", tfc_format_pid(progname), genkeyf);
+			tfc_esay("%s: Have a nice day!", tfc_format_pid(progname));
 		}
 
 		if (ctr_mode == TFC_MODE_XTS) {
@@ -1018,17 +1020,11 @@ _xts2genkey:	if (xwrite(krfd, pblk, TF_FROM_BITS(TFC_KEY_BITS)) == NOSIZE) xerro
 		xexit(0);
 	}
 
-	if (iseek_blocks && (do_edcrypt == TFC_DO_DECRYPT && do_mac != NO)) {
-		if (verbose) tfc_esay("%s: disabling signature verification on "
-			"requested partial decryption.", progname);
-		do_mac = NO;
-	}
-
 	if (do_mac != NO) {
 		if (mackey_opt == TFC_MACKEY_RAWKEY) skein(mackey, TF_MAX_BITS, key, key, TF_FROM_BITS(TFC_KEY_BITS));
 		if (ctr_mode < TFC_MODE_OCB) {
 			if (verbose) tfc_esay("%s: doing MAC calculation, processing speed "
-				"will be slower.", progname);
+				"will be slower.", tfc_format_pid(progname));
 			if (mackey_opt) skein_init_key(&sk, mackey, macbits);
 			else skein_init(&sk, macbits);
 		}
@@ -1066,7 +1062,7 @@ _ctrskip2:
 		xclose(kfd);
 		kfd = -1;
 	}
-	if (verbose) tfc_esay("%s: password hashing done", progname);
+	if (verbose) tfc_esay("%s: password hashing done", tfc_format_pid(progname));
 
 	if (overwrite_source && srcfname) argv[idx] = srcfname;
 
@@ -1129,6 +1125,7 @@ _ctrwagain:	lio = xwrite(dfd, pblk, lrem);
 			lrem -= lio;
 			goto _ctrwagain;
 		}
+		total_written_dst += ldone;
 		total_processed_dst += ldone;
 		delta_processed += ldone;
 	}
@@ -1138,7 +1135,7 @@ _ctrwagain:	lio = xwrite(dfd, pblk, lrem);
 	if (do_mac == TFC_MAC_JUST_VRFY2) {
 		rwd = tfc_fdgetpos(sfd);
 		if (rwd == NOFSIZE) {
-			tfc_esay("%s: WARNING: input is not seekable, disabling MAC testing mode", progname);
+			tfc_esay("%s: WARNING: input is not seekable, disabling MAC testing mode", tfc_format_pid(progname));
 			do_mac = TFC_MAC_VRFY;
 		}
 		goto _nodecrypt_again_vrfy2;
@@ -1153,6 +1150,7 @@ _decrypt_again_vrfy2:
 	}
 
 _nodecrypt_again_vrfy2:
+	loopcnt = 1;
 	errno = 0;
 	do_stop = NO;
 	while (1) {
@@ -1162,7 +1160,15 @@ _nodecrypt_again_vrfy2:
 		lrem = lblock = blk_len_adj(maxlen, total_processed_src, blksize);
 		if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(sfd);
 _ragain:	lio = xread(sfd, pblk, lrem);
-		if (lio == 0) do_stop = YES;
+		if (lio == 0) {
+			if ((do_read_loops != 0 && sfd != 0) && (loopcnt < do_read_loops)) {
+				lseek(sfd, 0L, SEEK_SET);
+				loopcnt++;
+				goto _ragain;
+			}
+
+			do_stop = YES;
+		}
 		if (lio != NOSIZE) ldone += lio;
 		else {
 			if (errno != EIO && catch_all_errors != YES)
@@ -1246,6 +1252,8 @@ _nowrite:	total_processed_dst += ldone;
 		}
 	}
 
+	if (verbose && status_timer && do_statline_dynamic == YES && statline_was_shown == YES) tfc_esay("\n");
+
 	errno = 0;
 	if (do_mac >= TFC_MAC_VRFY) {
 		if (!do_mac_file) {
@@ -1298,7 +1306,7 @@ _macragain:		lio = xread(sfd, pblk, lrem);
 
 		if (ldone < TF_FROM_BITS(macbits)) {
 			if (quiet == NO) tfc_esay("%s: short signature (%zu), "
-				"not verifying", progname, ldone);
+				"not verifying", tfc_format_pid(progname), ldone);
 			exitcode = 1;
 			goto _shortmac;
 		}
@@ -1315,23 +1323,24 @@ _macragain:		lio = xread(sfd, pblk, lrem);
 
 		if (!memcmp(tmpdata, macresult, TF_FROM_BITS(macbits))) {
 			if (quiet == NO) {
-				tfc_esay("%s: signature is good", progname);
+				tfc_esay("%s: signature is good", tfc_format_pid(progname));
 				if (verbose) {
 					if (do_outfmt == TFC_OUTFMT_B64) tfc_printbase64(stderr, macresult, TF_FROM_BITS(macbits), YES);
 					else mehexdump(macresult, TF_FROM_BITS(macbits), TF_FROM_BITS(macbits), YES);
 				}
 			}
 			if (do_mac == TFC_MAC_JUST_VRFY2) {
-				if (verbose) tfc_esay("%s: -u: MAC signature is valid, proceeding with decrypting it again", progname);
-				do_mac = TFC_MAC_DROP;
+				if (verbose) tfc_esay("%s: -u: MAC signature is valid, proceeding with decrypting it again", tfc_format_pid(progname));
+				maxlen = total_processed_src - SKEIN_DIGEST_SIZE;
+				do_mac = TFC_MAC_DROP2;
 				goto _decrypt_again_vrfy2;
 			}
 		}
 		else {
 			if (quiet == NO) {
 				tfc_esay("%s: signature is BAD: "
-				"wrong password, key, mode, or file is not signed", progname);
-				if (do_mac == TFC_MAC_JUST_VRFY2) tfc_esay("%s: -u: MAC signature is invalid, not decrypting it again", progname);
+				"wrong password, key, mode, or file is not signed", tfc_format_pid(progname));
+				if (do_mac == TFC_MAC_JUST_VRFY2) tfc_esay("%s: -u: MAC signature is invalid, not decrypting it again", tfc_format_pid(progname));
 			}
 			exitcode = 1;
 		}
@@ -1340,7 +1349,6 @@ _shortmac:	memset(macvrfy, 0, sizeof(macvrfy));
 		memset(macresult, 0, sizeof(macresult));
 		memset(tmpdata, 0, sizeof(tmpdata));
 	}
-
 	else if (do_mac == TFC_MAC_SIGN) {
 		if (ctr_mode < TFC_MODE_OCB) skein_final(macresult, &sk);
 		else skein(macresult, macbits, mackey, macresult, TF_FROM_BITS(macbits));
@@ -1366,6 +1374,7 @@ _macwagain:		lio = xwrite(dfd, pblk, lrem);
 				lrem -= lio;
 				goto _macwagain;
 			}
+			total_written_dst += ldone;
 			total_processed_dst += ldone;
 			delta_processed += ldone;
 		}
@@ -1397,6 +1406,7 @@ _macwagain:		lio = xwrite(dfd, pblk, lrem);
 		memset(macresult, 0, sizeof(macresult));
 		memset(tmpdata, 0, sizeof(tmpdata));
 	}
+	else if (do_mac == TFC_MAC_DROP2) total_processed_src += SKEIN_DIGEST_SIZE;
 
 	if (verbose || status_timer || (do_stop == YES && quiet == NO)) print_crypt_status(0);