tfc_getrandom(ctr, sizeof(ctr));
if (do_mac != NO) {
tfc_getrandom(mackey, sizeof(mackey));
- if (ctr_mode < TFC_MODE_OCB) skein_init_key(&sk, mackey, macbits);
+ skein_init_key(&sk, mackey, macbits);
}
if (ctr_mode == TFC_MODE_STREAM) tfe_init_iv(&tfe, key, ctr);
if (ctr_mode == TFC_MODE_XTS) tfc_getrandom(xtskey, sizeof(xtskey));
- tfc_nfsay(stdout, "%s: doing %s benchmark for %.4f seconds ... ", progname, tfc_modename(ctr_mode), dseconds);
+ tfc_nfsay(stdout, "%s: doing %s benchmark for %.4f seconds ... ", tfc_format_pid(progname), tfc_modename(ctr_mode), dseconds);
do_stop = NO;
while (1) {
lblock = blk_len_adj(NOFSIZE, total_processed_src, blksize);
total_processed_src += lblock;
- if (do_mac != NO && ctr_mode < TFC_MODE_OCB)
- skein_update(&sk, srcblk, lblock);
+ if (do_mac != NO) skein_update(&sk, srcblk, lblock);
if (ctr_mode == TFC_MODE_CTR) tf_ctr_crypt(key, ctr, srcblk, srcblk, lblock);
else if (ctr_mode == TFC_MODE_STREAM) tf_stream_crypt(&tfe, srcblk, srcblk, lblock);
tf_cbc_encrypt(key, ctr, srcblk, srcblk, lblock);
else if (ctr_mode == TFC_MODE_CBC && do_edcrypt == TFC_DO_DECRYPT)
tf_cbc_decrypt(key, ctr, srcblk, srcblk, lblock);
-
- else if (ctr_mode == TFC_MODE_OCB && do_edcrypt == TFC_DO_ENCRYPT)
- tf_ocb_encrypt(key, ctr, srcblk, do_mac ? macresult : NULL, srcblk, lblock, xtsblocks);
- else if (ctr_mode == TFC_MODE_OCB && do_edcrypt == TFC_DO_DECRYPT)
- tf_ocb_decrypt(key, ctr, srcblk, do_mac ? macresult : NULL, srcblk, lblock, xtsblocks);
+ else if (ctr_mode == TFC_MODE_PCBC && do_edcrypt == TFC_DO_ENCRYPT)
+ tf_pcbc_encrypt(key, ctr, srcblk, srcblk, lblock);
+ else if (ctr_mode == TFC_MODE_PCBC && do_edcrypt == TFC_DO_DECRYPT)
+ tf_pcbc_decrypt(key, ctr, srcblk, srcblk, lblock);
delta_processed += lblock;
}