projects
/
tfcrypt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iotool: separate alias to do only plain I/O.
[tfcrypt.git]
/
tfcrypt.c
diff --git
a/tfcrypt.c
b/tfcrypt.c
index fb3dfb9cb44a7e0826dc059c13c555ef7ecbc761..604a6bf990247abd61c19f996a83dea63d989002 100644
(file)
--- a/
tfcrypt.c
+++ b/
tfcrypt.c
@@
-128,6
+128,12
@@
int main(int argc, char **argv)
_baddfname:
memset(s, 0, n);
_baddfname:
memset(s, 0, n);
+ if (!strcmp(progname, "iotool")) {
+ do_edcrypt = TFC_DO_PLAIN;
+ password = YES;
+ ctr_mode = TFC_MODE_PLAIN;
+ }
+
opterr = 0;
while ((c = getopt(argc, argv, "L:s:aU:C:r:K:t:Pkzxc:l:qedn:vV:pwE:O:S:AmM:R:Z:WHD:")) != -1) {
switch (c) {
opterr = 0;
while ((c = getopt(argc, argv, "L:s:aU:C:r:K:t:Pkzxc:l:qedn:vV:pwE:O:S:AmM:R:Z:WHD:")) != -1) {
switch (c) {
@@
-195,10
+201,10
@@
_baddfname:
ctr_mode = TFC_MODE_PLAIN;
break;
case 'e':
ctr_mode = TFC_MODE_PLAIN;
break;
case 'e':
- do_edcrypt = TFC_DO_ENCRYPT;
+
if (do_edcrypt != TFC_DO_PLAIN)
do_edcrypt = TFC_DO_ENCRYPT;
break;
case 'd':
break;
case 'd':
- do_edcrypt = TFC_DO_DECRYPT;
+
if (do_edcrypt != TFC_DO_PLAIN)
do_edcrypt = TFC_DO_DECRYPT;
break;
case 'D':
macbits = strtoul(optarg, &stoi, 10);
break;
case 'D':
macbits = strtoul(optarg, &stoi, 10);