[SCM] GNU gnutls branch, master, updated. gnutls_3_0_13-35-gb210e7e

[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=b210e7e09f82b1089d17289b0ae54095bd2218ba

The branch, master has been updated
       via  b210e7e09f82b1089d17289b0ae54095bd2218ba (commit)
      from  83d2e762d0ea97e7a0785495fe8de3cb22634bc2 (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 b210e7e09f82b1089d17289b0ae54095bd2218ba
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Feb 23 19:22:28 2012 +0100

    compilation fixes.

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

Summary of changes:
 lib/accelerated/cryptodev-gcm.c |   11 ++++++++++-
 lib/accelerated/cryptodev.c     |   14 +++++++++++---
 lib/accelerated/cryptodev.h     |    8 --------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/lib/accelerated/cryptodev-gcm.c b/lib/accelerated/cryptodev-gcm.c
index 1f5bea6..1c59156 100644
--- a/lib/accelerated/cryptodev-gcm.c
+++ b/lib/accelerated/cryptodev-gcm.c
@@ -24,13 +24,22 @@
 #include <gnutls_int.h>
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
+#include <accelerated/cryptodev.h>
 
 #ifdef ENABLE_CRYPTODEV
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <crypto/cryptodev.h>
-#include <accelerated/cryptodev.h>
+
+#ifndef CRYPTO_CIPHER_MAX_KEY_LEN
+#define CRYPTO_CIPHER_MAX_KEY_LEN 64
+#endif
+
+#ifndef EALG_MAX_BLOCK_LEN
+#define EALG_MAX_BLOCK_LEN 16
+#endif
+
 
 #ifdef CIOCAUTHCRYPT
 
diff --git a/lib/accelerated/cryptodev.c b/lib/accelerated/cryptodev.c
index d0d5cfc..3170d42 100644
--- a/lib/accelerated/cryptodev.c
+++ b/lib/accelerated/cryptodev.c
@@ -24,13 +24,21 @@
 #include <gnutls_int.h>
 #include <gnutls/crypto.h>
 #include <gnutls_errors.h>
+#include <accelerated/cryptodev.h>
 
 #ifdef ENABLE_CRYPTODEV
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <crypto/cryptodev.h>
-#include <accelerated/cryptodev.h>
+
+#ifndef CRYPTO_CIPHER_MAX_KEY_LEN
+#define CRYPTO_CIPHER_MAX_KEY_LEN 64
+#endif
+
+#ifndef EALG_MAX_BLOCK_LEN
+#define EALG_MAX_BLOCK_LEN 16
+#endif
 
 int _gnutls_cryptodev_fd = -1;
 
@@ -621,13 +629,13 @@ register_mac_digest (int cfd)
 
 #else /* ENABLE_CRYPTODEV */
 int
-_gnutls_cryptodev_init ()
+_gnutls_cryptodev_init (void)
 {
   return 0;
 }
 
 void
-_gnutls_cryptodev_deinit ()
+_gnutls_cryptodev_deinit (void)
 {
   return;
 }
diff --git a/lib/accelerated/cryptodev.h b/lib/accelerated/cryptodev.h
index f531be0..a430bdd 100644
--- a/lib/accelerated/cryptodev.h
+++ b/lib/accelerated/cryptodev.h
@@ -1,13 +1,5 @@
 extern int _gnutls_cryptodev_fd;
 
-#ifndef CRYPTO_CIPHER_MAX_KEY_LEN
-#define CRYPTO_CIPHER_MAX_KEY_LEN 64
-#endif
-
-#ifndef EALG_MAX_BLOCK_LEN
-#define EALG_MAX_BLOCK_LEN 16
-#endif
-
 void _gnutls_cryptodev_deinit (void);
 int _gnutls_cryptodev_init (void);
 int _cryptodev_register_gcm_crypto (int cfd);


hooks/post-receive
-- 
GNU gnutls