X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_bench.c;h=e05ac78b3af805306b020f756cf81293f2258a22;hb=b0637473e28d682b2ec870dd62cc05eb749842d0;hp=595009ec4294dc28ed953dd2a2267fc022e50690;hpb=efa545d64b910923248233618e774ca3b87efebb;p=tfcrypt.git

diff --git a/tfc_bench.c b/tfc_bench.c
index 595009e..e05ac78 100644
--- a/tfc_bench.c
+++ b/tfc_bench.c
@@ -2,7 +2,7 @@
  * tfcrypt -- high security Threefish encryption tool.
  *
  * tfcrypt is copyrighted:
- * Copyright (C) 2012-2018 Andrey Rys. All rights reserved.
+ * Copyright (C) 2012-2019 Andrey Rys. All rights reserved.
  *
  * tfcrypt is licensed to you under the terms of std. MIT/X11 license:
  *
@@ -49,12 +49,12 @@ void do_benchmark(tfc_useconds useconds, double dseconds)
 	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) {
@@ -63,8 +63,7 @@ void do_benchmark(tfc_useconds useconds, double dseconds)
 		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);
@@ -80,11 +79,10 @@ void do_benchmark(tfc_useconds useconds, double dseconds)
 			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;
 	}