From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 20 Feb 2012 18:26:48 +0000 (+0100)
Subject: benchmark-ciphers re-enabled
X-Git-Tag: gnutls_3_0_14~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60cbde88d2e0e67646de751d36b59da06e533aff;p=thirdparty%2Fgnutls.git

benchmark-ciphers re-enabled
---

diff --git a/src/cli.c b/src/cli.c
index e673aad8d2..ccd59d0786 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -52,6 +52,7 @@
 #include <minmax.h>
 
 #include "sockets.h"
+#include "benchmark.h"
 
 #include <common.h>
 #include <socket.h>
@@ -1114,6 +1115,24 @@ const char* rest = NULL;
   
   if (rest == NULL && argc > 0)
     rest = argv[0];
+    
+  if (HAVE_OPT(BENCHMARK_CIPHERS))
+    {
+      benchmark_cipher(1, OPT_VALUE_DEBUG); 
+      exit(0);
+    }
+
+  if (HAVE_OPT(BENCHMARK_SOFT_CIPHERS))
+    {
+      benchmark_cipher(0, OPT_VALUE_DEBUG); 
+      exit(0);
+    }
+
+  if (HAVE_OPT(BENCHMARK_TLS))
+    {
+      benchmark_tls(OPT_VALUE_DEBUG); 
+      exit(0);
+    }
 
   if (HAVE_OPT(PRIORITY)) 
     {