if (!strcmp(progname, "iotool")) {
do_edcrypt = TFC_DO_PLAIN;
if (!strcmp(progname, "iotool")) {
do_edcrypt = TFC_DO_PLAIN;
+ if (!strcmp(progname, "xor")) {
+ do_edcrypt = TFC_DO_PLAIN;
+ ctr_mode = TFC_MODE_XOR;
+ /* xor: default to stdin if invoked without args */
+ kfd = 0;
+ }
+
- 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) {
+ while ((c = getopt(argc, argv, "L:s:aU:C:r:K:t:PXkzxc:l:qedn:vV:pwE:o:O:S:AmuM:R:Z:WHD:")) != -1) {
else xerror(NO, YES, YES, "%s: invalid mode of operation", optarg);
break;
case 'P':
else xerror(NO, YES, YES, "%s: invalid mode of operation", optarg);
break;
case 'P':
"%s: invalid iseek value", s);
}
else iseek = tfc_modifysize(iseek, strchr(s, ':'));
"%s: invalid iseek value", s);
}
else iseek = tfc_modifysize(iseek, strchr(s, ':'));
"%s: invalid iseek value", s);
}
else iseek = tfc_modifysize(iseek, strchr(s, ':'));
"%s: invalid iseek value", s);
}
else iseek = tfc_modifysize(iseek, strchr(s, ':'));
xerror(NO, YES, YES, "Cannot encrypt and read CTR from source!");
if (overwrite_source && counter_opt == TFC_CTR_RAND)
xerror(NO, YES, YES, "Cannot embed a CTR into file when overwriting it!");
xerror(NO, YES, YES, "Cannot encrypt and read CTR from source!");
if (overwrite_source && counter_opt == TFC_CTR_RAND)
xerror(NO, YES, YES, "Cannot embed a CTR into file when overwriting it!");
- if (ctr_mode == TFC_MODE_PLAIN
- && (do_edcrypt || do_mac || rawkey
- || mackey_opt || counter_opt || counter_file))
+ if (do_edcrypt == TFC_DO_PLAIN
+ && (do_mac || saltf || rawkey || mackey_opt || counter_opt || counter_file))
xerror(NO, YES, YES, "Encryption facility is disabled when in plain IO mode.");
errno = 0;
xerror(NO, YES, YES, "Encryption facility is disabled when in plain IO mode.");
errno = 0;
if (!strcmp(argv[idx], "-")) kfd = 0;
else kfd = xopen(argv[idx], O_RDONLY | O_LARGEFILE);
if (!strcmp(argv[idx], "-")) kfd = 0;
else kfd = xopen(argv[idx], O_RDONLY | O_LARGEFILE);
lio = strnlen(argv[idx], PATH_MAX);
memset(argv[idx], '*', lio);
lio = strnlen(argv[idx], PATH_MAX);
memset(argv[idx], '*', lio);
xerror(ignore_seek_errors, NO, NO, "%s: seek failed", srcfname);
}
xerror(ignore_seek_errors, NO, NO, "%s: seek failed", srcfname);
}
- if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(sfd);
-_ragain: lio = xread(sfd, pblk, lrem);
+ if (error_action == TFC_ERRACT_SYNC) rdpos = tfc_fdgetpos(FLFD(sfd, kfd));
+_ragain: lio = xread(FLFD(sfd, kfd), pblk, lrem);
- if ((do_read_loops != 0 && sfd != 0) && (loopcnt < do_read_loops)) {
- lseek(sfd, 0L, SEEK_SET);
+ if ((do_read_loops != 0 && FLFD(sfd, kfd) != 0) && (loopcnt < do_read_loops)) {
+ lseek(FLFD(sfd, kfd), 0L, SEEK_SET);
xerror(YES, NO, NO, "%s", srcfname);
lio = ldone = lrem = lblock;
memset(srcblk, 0, lio);
xerror(YES, NO, NO, "%s", srcfname);
lio = ldone = lrem = lblock;
memset(srcblk, 0, lio);
- if (rdpos == NOFSIZE) lseek(sfd, lio, SEEK_CUR);
- else lseek(sfd, rdpos + lio, SEEK_SET);
+ if (rdpos == NOFSIZE) lseek(FLFD(sfd, kfd), lio, SEEK_CUR);
+ else lseek(FLFD(sfd, kfd), rdpos + lio, SEEK_SET);
break;
default: xerror(NO, NO, NO, "%s", srcfname); break;
}
break;
default: xerror(NO, NO, NO, "%s", srcfname); break;
}
if (do_mac == TFC_MAC_SIGN) skein_update(&sk, srcblk, ldone);
if (ctr_mode == TFC_MODE_CTR) tf_ctr_crypt(key, ctr, dstblk, srcblk, ldone);
if (do_mac == TFC_MAC_SIGN) skein_update(&sk, srcblk, ldone);
if (ctr_mode == TFC_MODE_CTR) tf_ctr_crypt(key, ctr, dstblk, srcblk, ldone);
else if (ctr_mode == TFC_MODE_PLAIN)
memcpy(dstblk, srcblk, ldone);
else if (ctr_mode == TFC_MODE_PLAIN)
memcpy(dstblk, srcblk, ldone);
if (do_mac >= TFC_MAC_VRFY) skein_update(&sk, dstblk, ldone);
if (do_mac >= TFC_MAC_JUST_VRFY) goto _nowrite;
if (do_mac >= TFC_MAC_VRFY) skein_update(&sk, dstblk, ldone);
if (do_mac >= TFC_MAC_JUST_VRFY) goto _nowrite;