[SCM] GNU gnutls branch, master, updated. gnutls_3_0_13-16-g60cbde8

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=60cbde88d2e0e67646de751d36b59da06e533aff

The branch, master has been updated
       via  60cbde88d2e0e67646de751d36b59da06e533aff (commit)
       via  93a159f00e030d995bedfc684fe5db67a9305779 (commit)
      from  48f8c8da864c8a8acecbe6e6ae7f7b52d1bd4b0d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60cbde88d2e0e67646de751d36b59da06e533aff
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Feb 20 19:26:48 2012 +0100

    benchmark-ciphers re-enabled

commit 93a159f00e030d995bedfc684fe5db67a9305779
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Feb 20 18:56:10 2012 +0100

    fixes in cryptodev support. Added support for digest algorithms.

-----------------------------------------------------------------------

Summary of changes:
 lib/accelerated/cryptodev.c |   15 +++++++++++----
 src/cli.c                   |   19 +++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/lib/accelerated/cryptodev.c b/lib/accelerated/cryptodev.c
index 1a89956..4596997 100644
--- a/lib/accelerated/cryptodev.c
+++ b/lib/accelerated/cryptodev.c
@@ -327,6 +327,7 @@ static int
 cryptodev_mac_hash (void *_ctx, const void *text, size_t textsize)
 {
   struct cryptodev_ctx *ctx = _ctx;
+
   ctx->cryp.len = textsize;
   ctx->cryp.src = (void *) text;
   ctx->cryp.dst = NULL;
@@ -433,9 +434,16 @@ cryptodev_digest_init (gnutls_digest_algorithm_t 
algorithm, void **_ctx)
   ctx = *_ctx;
 
   ctx->cfd = cryptodev_fd;
-
   ctx->sess.mac = dig;
 
+  if (ioctl (ctx->cfd, CIOCGSESSION, &ctx->sess))
+    {
+      gnutls_assert ();
+      gnutls_free(ctx);
+      return GNUTLS_E_CRYPTODEV_IOCTL_ERROR;
+    }
+  ctx->cryp.ses = ctx->sess.ses;
+
   return 0;
 }
 
@@ -512,7 +520,7 @@ register_mac_digest (int cfd)
 
       ioctl (cfd, CIOCFSESSION, &sess);
 
-      _gnutls_debug_log ("/dev/crypto: registering: %s\n",
+      _gnutls_debug_log ("/dev/crypto: registering: HMAC-%s\n",
                          gnutls_mac_get_name (i));
       ret = gnutls_crypto_single_mac_register (i, 90, &mac_struct);
       if (ret < 0)
@@ -546,7 +554,6 @@ register_mac_digest (int cfd)
           gnutls_assert ();
           return ret;
         }
-
     }
 
   return 0;
@@ -559,7 +566,7 @@ register_mac_digest (int cfd)
   return 0;
 }
 
-#endif /* defined(CIOCSESSIONCLONE) && defined(COP_FLAG_UPDATE) */
+#endif /* defined(COP_FLAG_UPDATE) */
 
 #else /* ENABLE_CRYPTODEV */
 int
diff --git a/src/cli.c b/src/cli.c
index e673aad..ccd59d0 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)) 
     {


hooks/post-receive
-- 
GNU gnutls