X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=tfc_bench.c;h=2c0553890101b5f6113631cc9205c999a83ccf85;hb=d659ac85a7c63b7833ab793be2f37fbc4ca7ba6b;hp=e8ddaa3a7f5803b9890c54552cc6928de89cac4d;hpb=5faadb0da4b63d4aa3359cfd97953738ee59a90d;p=tfcrypt.git

diff --git a/tfc_bench.c b/tfc_bench.c
index e8ddaa3..2c05538 100644
--- a/tfc_bench.c
+++ b/tfc_bench.c
@@ -49,7 +49,7 @@ 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));
@@ -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);
@@ -81,11 +80,6 @@ void do_benchmark(tfc_useconds useconds, double dseconds)
 		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);
-
 		delta_processed += lblock;
 	}
 }