X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfcrypt.c;h=590cb33d2fa4ea2ae104a371ce862c4c8fde716a;hb=HEAD;hp=5182a34a8467344dd3b306d17d10340b1f49efb3;hpb=7274f5687aeae3d14e686cff6fb8626e644b09c9;p=tfcrypt.git diff --git a/tfcrypt.c b/tfcrypt.c index 5182a34..590cb33 100644 --- a/tfcrypt.c +++ b/tfcrypt.c @@ -643,7 +643,6 @@ _baddfname: break; case 'q': quiet = YES; - xexit_no_nl = YES; verbose = NO; do_full_hexdump = NO; status_timer = 0; @@ -1205,6 +1204,7 @@ _decrypt_again_vrfy2: } total_processed_src = rwd; memcpy(ctr, svctr, TF_BLOCK_SIZE); + if (ctr_mode == TFC_MODE_STREAM) tfe_init_iv(&tfe, key, ctr); memset(svctr, 0, TF_BLOCK_SIZE); } @@ -1473,7 +1473,7 @@ _macwagain: lio = xwrite(dfd, pblk, lrem); } 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); + if (verbose || status_timer || (do_stop == YES && quiet == NO)) print_crypt_status(TFC_SIGLAST); xexit(exitcode); return -1;