X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.c;h=6b21e960dbe93e6e68188a0df0d17a152bf6b666;hb=44bb43b90d7aad1878b20b6c9df848b998820374;hp=15f23e2ea3159a71410c03b43c8abd85ad6cf1fa;hpb=093131279777dd0af9fef493abfb7bd6dc9c1c79;p=tfcrypt.git

diff --git a/tfcrypt.c b/tfcrypt.c
index 15f23e2..6b21e96 100644
--- a/tfcrypt.c
+++ b/tfcrypt.c
@@ -29,6 +29,21 @@
 #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)
+{
+	int fd;
+
+	if (!strcmp(logfile, "-")) return;
+
+	fd = open(logfile, O_WRONLY | O_CREAT | O_LARGEFILE | O_TRUNC, 0666);
+	if (fd == -1) xerror(NO, NO, YES, "%s", logfile);
+	xclose(2);
+	if (dup2(fd, 2) == -1) xexit(2);
+	xclose(fd);
+	do_statline_dynamic = NO;
+}
 
 static int getps_filter(struct getpasswd_state *getps, char chr, size_t pos)
 {
@@ -115,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;
@@ -138,7 +153,7 @@ _baddfname:
 	}
 
 	opterr = 0;
-	while ((c = getopt(argc, argv, "L:s:aU:C:r:K:t:Pkzxc:l:qedn:vV:pwE:O:S:AmuM:R:Z:WHD:")) != -1) {
+	while ((c = getopt(argc, argv, "L:s:aU:C:r:K:t:Pkzxc:l:qedn:vV:pwE:o:O:S:AmuM:R:Z:WHD:")) != -1) {
 		switch (c) {
 			case 'L':
 				read_defaults(optarg, NO);
@@ -285,6 +300,9 @@ _baddfname:
 					error_action = TFC_ERRACT_LSYNC;
 				else xerror(NO, YES, YES, "invalid error action %s specified", optarg);
 				break;
+			case 'o':
+				open_log(optarg);
+				break;
 			case 'O':
 				s = d = optarg; t = NULL;
 				while ((s = strtok_r(d, ",", &t))) {
@@ -317,6 +335,16 @@ _baddfname:
 						do_full_key = YES;
 					else if (!strcmp(s, "showsecrets"))
 						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) == '=') {
 						s += 5;
 						blksize = (size_t)tfc_humanfsize(s, &stoi);
@@ -552,6 +580,7 @@ _baddfname:
 				break;
 			case 'q':
 				quiet = YES;
+				xexit_no_nl = YES;
 				verbose = NO;
 				do_full_hexdump = NO;
 				status_timer = 0;
@@ -746,7 +775,7 @@ _nokeyfd:
 
 		if (do_edcrypt == TFC_DO_DECRYPT && do_mac != NO && maxlen != NOFSIZE) {
 			if (verbose) tfc_esay("%s: disabling signature verification on "
-				"requested partial decryption.", progname);
+				"requested partial decryption.", tfc_format_pid(progname));
 			do_mac = NO;
 		}
 
@@ -821,7 +850,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;
@@ -979,9 +1008,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) {
@@ -999,7 +1028,7 @@ _xts2genkey:	if (xwrite(krfd, pblk, TF_FROM_BITS(TFC_KEY_BITS)) == NOSIZE) xerro
 
 	if (iseek_blocks && (do_edcrypt == TFC_DO_DECRYPT && do_mac != NO)) {
 		if (verbose) tfc_esay("%s: disabling signature verification on "
-			"requested partial decryption.", progname);
+			"requested partial decryption.", tfc_format_pid(progname));
 		do_mac = NO;
 	}
 
@@ -1007,7 +1036,7 @@ _xts2genkey:	if (xwrite(krfd, pblk, TF_FROM_BITS(TFC_KEY_BITS)) == NOSIZE) xerro
 		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);
 		}
@@ -1045,7 +1074,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;
 
@@ -1071,9 +1100,8 @@ _plain:
 	sigact.sa_flags = SA_RESTART;
 	sigact.sa_handler = print_crypt_status;
 	sigaction(SIGUSR1, &sigact, NULL);
-	sigaction(SIGTSTP, &sigact, NULL);
 	sigaction(SIGALRM, &sigact, NULL);
-	if (status_timer) setup_next_alarm(status_timer);
+	if (status_timer) setup_next_alarm(status_timer > 1000000 ? 1000000 : status_timer);
 	sigact.sa_handler = change_status_width;
 	sigaction(SIGQUIT, &sigact, NULL);
 	sigact.sa_handler = change_status_timer;
@@ -1082,11 +1110,14 @@ _plain:
 		sigact.sa_handler = print_crypt_status;
 		sigaction(SIGINT, &sigact, NULL);
 		sigaction(SIGTERM, &sigact, NULL);
+		sigaction(SIGTSTP, &sigact, NULL);
 	}
 	else {
 		sigact.sa_handler = exit_sigterm;
 		sigaction(SIGINT, &sigact, NULL);
 		sigaction(SIGTERM, &sigact, NULL);
+		sigact.sa_handler = handle_sigtstp;
+		sigaction(SIGTSTP, &sigact, NULL);
 	}
 	memset(&sigact, 0, sizeof(struct sigaction));
 
@@ -1115,7 +1146,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;
@@ -1130,6 +1161,7 @@ _decrypt_again_vrfy2:
 	}
 
 _nodecrypt_again_vrfy2:
+	loopcnt = 1;
 	errno = 0;
 	do_stop = NO;
 	while (1) {
@@ -1139,7 +1171,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)
@@ -1217,7 +1257,10 @@ _wagain:	lio = xwrite(dfd, pblk, lrem);
 _nowrite:	total_processed_dst += ldone;
 		delta_processed += ldone;
 
-		if (maxlen != NOFSIZE && total_processed_src >= maxlen) break;
+		if (maxlen != NOFSIZE && total_processed_src >= maxlen) {
+			do_stop = YES;
+			break;
+		}
 	}
 
 	errno = 0;
@@ -1272,7 +1315,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;
 		}
@@ -1289,14 +1332,14 @@ _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);
+				if (verbose) tfc_esay("%s: -u: MAC signature is valid, proceeding with decrypting it again", tfc_format_pid(progname));
 				do_mac = TFC_MAC_DROP;
 				goto _decrypt_again_vrfy2;
 			}
@@ -1304,8 +1347,8 @@ _macragain:		lio = xread(sfd, pblk, lrem);
 		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;
 		}
@@ -1372,7 +1415,7 @@ _macwagain:		lio = xwrite(dfd, pblk, lrem);
 		memset(tmpdata, 0, sizeof(tmpdata));
 	}
 
-	if (verbose || status_timer || do_stop == YES) print_crypt_status(0);
+	if (verbose || status_timer || (do_stop == YES && quiet == NO)) print_crypt_status(0);
 
 	xexit(exitcode);
 	return -1;