1 files changed, 11 insertions, 30 deletions

diff --git a/hardinfo2/benchmark.c b/hardinfo2/benchmark.c
index 79d3d2d4..6ab1a8af 100644
--- a/hardinfo2/benchmark.c
+++ b/hardinfo2/benchmark.c
@@ -28,8 +28,7 @@
 enum {
     BENCHMARK_ZLIB,
     BENCHMARK_FIB,
-    BENCHMARK_MD5,
-    BENCHMARK_SHA1,
+    BENCHMARK_CRYPTOHASH,
     BENCHMARK_BLOWFISH,
     BENCHMARK_RAYTRACE,
     BENCHMARK_N_ENTRIES
@@ -38,22 +37,19 @@ enum {
 void scan_zlib(gboolean reload);
 void scan_raytr(gboolean reload);
 void scan_bfsh(gboolean reload);
-void scan_md5(gboolean reload);
+void scan_cryptohash(gboolean reload);
 void scan_fib(gboolean reload);
-void scan_sha1(gboolean reload);
 
 gchar *callback_zlib();
 gchar *callback_raytr();
 gchar *callback_bfsh();
-gchar *callback_md5();
 gchar *callback_fib();
-gchar *callback_sha1();
+gchar *callback_cryptohash();
 
 static ModuleEntry entries[] = {
     {"CPU ZLib", "compress.png", callback_zlib, scan_zlib},
     {"CPU Fibonacci", "module.png", callback_fib, scan_fib},
-    {"CPU MD5", "module.png", callback_md5, scan_md5},
-    {"CPU SHA1", "module.png", callback_sha1, scan_sha1},
+    {"CPU CryptoHash", "module.png", callback_cryptohash, scan_cryptohash},
     {"CPU Blowfish", "blowfish.png", callback_bfsh, scan_bfsh},
     {"FPU Raytracing", "raytrace.png", callback_raytr, scan_raytr},
     {NULL}
@@ -215,8 +211,7 @@ static gdouble bench_results[BENCHMARK_N_ENTRIES];
 
 #include <arch/common/fib.h>
 #include <arch/common/zlib.h>
-#include <arch/common/md5.h>
-#include <arch/common/sha1.h>
+#include <arch/common/cryptohash.h>
 #include <arch/common/blowfish.h>
 #include <arch/common/raytrace.h>
 
@@ -238,10 +233,10 @@ gchar *callback_bfsh()
 				     "CPU Blowfish");
 }
 
-gchar *callback_md5()
+gchar *callback_cryptohash()
 {
-    return benchmark_include_results_reverse(bench_results[BENCHMARK_MD5],
-					     "CPU MD5");
+    return benchmark_include_results_reverse(bench_results[BENCHMARK_CRYPTOHASH],
+					     "CPU Cryptohash");
 }
 
 gchar *callback_fib()
@@ -250,12 +245,6 @@ gchar *callback_fib()
 				     "CPU Fibonacci");
 }
 
-gchar *callback_sha1()
-{
-    return benchmark_include_results_reverse(bench_results[BENCHMARK_SHA1],
-					     "CPU SHA1");
-}
-
 #define RUN_WITH_HIGH_PRIORITY(fn)			\
   do {							\
     int old_priority = getpriority(PRIO_PROCESS, 0);	\
@@ -285,10 +274,10 @@ void scan_bfsh(gboolean reload)
     SCAN_END();
 }
 
-void scan_md5(gboolean reload)
+void scan_cryptohash(gboolean reload)
 {
     SCAN_START();
-    RUN_WITH_HIGH_PRIORITY(benchmark_md5);
+    RUN_WITH_HIGH_PRIORITY(benchmark_cryptohash);
     SCAN_END();
 }
 
@@ -299,21 +288,13 @@ void scan_fib(gboolean reload)
     SCAN_END();
 }
 
-void scan_sha1(gboolean reload)
-{
-    SCAN_START();
-    RUN_WITH_HIGH_PRIORITY(benchmark_sha1);
-    SCAN_END();
-}
-
 const gchar *hi_note_func(gint entry)
 {
     switch (entry) {
     case BENCHMARK_ZLIB:
 	return "Results in KiB/second. Higher is better.";
 
-    case BENCHMARK_MD5:
-    case BENCHMARK_SHA1:
+    case BENCHMARK_CRYPTOHASH:
 	return "Results in MiB/second. Higher is better.";
 
     case BENCHMARK_RAYTRACE: