From 8cf1129abf5f42bd57fe0f6f0c5308d425b95027 Mon Sep 17 00:00:00 2001 From: Andrey Rys Date: Sun, 28 Nov 2021 14:43:54 +0100 Subject: [PATCH] lift restrictions on partial "window" seeked signature verifying --- VERSION | 2 +- tfcrypt.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/VERSION b/VERSION index 0691f67..59343b0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -52 +53 diff --git a/tfcrypt.c b/tfcrypt.c index 6b21e96..e5ac31a 100644 --- a/tfcrypt.c +++ b/tfcrypt.c @@ -773,12 +773,6 @@ _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.", tfc_format_pid(progname)); - do_mac = NO; - } - if ((do_mac >= TFC_MAC_VRFY || do_mac == TFC_MAC_DROP) && !do_mac_file) { maxlen = tfc_fdsize(sfd); if (maxlen == NOFSIZE) @@ -1026,12 +1020,6 @@ _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.", tfc_format_pid(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) { -- 2.31.1