projects
/
tfcrypt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
44bb43b
)
lift restrictions on partial "window" seeked signature verifying
author
Andrey Rys
<rys@lynxlynx.ru>
Sun, 28 Nov 2021 13:43:54 +0000
(14:43 +0100)
committer
Andrey Rys
<rys@lynxlynx.ru>
Sun, 28 Nov 2021 13:43:54 +0000
(14:43 +0100)
VERSION
patch
|
blob
|
history
tfcrypt.c
patch
|
blob
|
history
diff --git
a/VERSION
b/VERSION
index 0691f67b202a873c99bdb9b99e15a667cb916a5b..59343b09ec765366a5b0ac04196385079acd864e 100644
(file)
--- a/
VERSION
+++ b/
VERSION
@@
-1
+1
@@
-5
2
+5
3
diff --git
a/tfcrypt.c
b/tfcrypt.c
index 6b21e960dbe93e6e68188a0df0d17a152bf6b666..e5ac31a33f99f600324ae2dbb8f13b52ceb65041 100644
(file)
--- a/
tfcrypt.c
+++ b/
tfcrypt.c
@@
-773,12
+773,6
@@
_nokeyfd:
}
if (sfd == -1) xerror(NO, NO, YES, "%s", argv[idx]);
}
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)
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);
}
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) {
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) {