[SCM] GNU gnutls branch, master, updated. gnutls_3_0_17-34-ge9f1baf

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

The branch, master has been updated
       via  e9f1baffe51b03459219c841e06bf598685da7dc (commit)
       via  a82fe02798315cb5bd53c4f128c3cb1dcd5e2c91 (commit)
       via  3ce217675c7cb986de7b711d8c5c7880d7a077da (commit)
      from  207230b72a2c9df950ef53a1b8c469a823749830 (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 e9f1baffe51b03459219c841e06bf598685da7dc
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 22 22:57:37 2012 +0100

    improvements in long long usage

commit a82fe02798315cb5bd53c4f128c3cb1dcd5e2c91
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 22 22:33:15 2012 +0100

    corrected probing of cryptodev digests.

commit 3ce217675c7cb986de7b711d8c5c7880d7a077da
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Mar 22 22:03:02 2012 +0100

    Do not assume sizeof(unsigned long)==sizeof(void*).
    Based on patch by B. Scott Michel.

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

Summary of changes:
 NEWS                          |    2 ++
 lib/accelerated/cryptodev.c   |    4 ++--
 lib/accelerated/x86/aes-x86.h |    2 +-
 m4/hooks.m4                   |   13 +++++++------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index d23e777..c8fded3 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ See the end for copying conditions.
 ** certtool: Avoid a Y2K38 bug when generating certificates.
 Patch by Robert Millan.
 
+** libgnutls: Fixes for W64 API. Patch by B. Scott Michel.
+
 ** libgnutls: Corrected VIA padlock detection for old 
 VIA processors. Reported by Kris Karas.
 
diff --git a/lib/accelerated/cryptodev.c b/lib/accelerated/cryptodev.c
index 7d1eacc..8a239d3 100644
--- a/lib/accelerated/cryptodev.c
+++ b/lib/accelerated/cryptodev.c
@@ -427,8 +427,8 @@ register_mac_digest (int cfd)
         continue;
 
       sess.mac = gnutls_mac_map[i];
-      sess.keylen = 8;
-      sess.key = fake_key;
+      sess.mackeylen = 8;
+      sess.mackey = fake_key;
 
       if (ioctl (cfd, CIOCGSESSION, &sess))
         {
diff --git a/lib/accelerated/x86/aes-x86.h b/lib/accelerated/x86/aes-x86.h
index 7b842c4..33764fe 100644
--- a/lib/accelerated/x86/aes-x86.h
+++ b/lib/accelerated/x86/aes-x86.h
@@ -7,7 +7,7 @@ void register_x86_crypto (void);
 void register_padlock_crypto(void);
 
 #define ALIGN16(x) \
-        ((void *)(((unsigned long)(x)+0x0f)&~(0x0f)))
+        ((void *)(((ptrdiff_t)(x)+(ptrdiff_t)0x0f)&~((ptrdiff_t)0x0f)))
 
 #define AES_KEY_ALIGN_SIZE 4
 #define AES_MAXNR 14
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 7e51acb..ee6ba5a 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -221,15 +221,16 @@ fi
   # For storing integers in pointers without warnings
   # 
http://developer.gnome.org/doc/API/2.0/glib/glib-Type-Conversion-Macros.html#desc
   AC_CHECK_SIZEOF(void *)
+  AC_CHECK_SIZEOF(long long)
   AC_CHECK_SIZEOF(long)
   AC_CHECK_SIZEOF(int)
-  case $ac_cv_sizeof_void_p in
-    $ac_cv_sizeof_long)
+  if test x$ac_cv_sizeof_void_p = x$ac_cv_sizeof_long;then
       AC_DEFINE([GNUTLS_POINTER_TO_INT_CAST], [(long)],
                 [Additional cast to bring void* to a type castable to int.])
-      ;;
-    *)
+  elif test x$ac_cv_sizeof_void_p = x$ac_cv_sizeof_long_long;then
+      AC_DEFINE([GNUTLS_POINTER_TO_INT_CAST], [(long long)],
+                [Additional cast to bring void* to a type castable to int.])
+   else
       AC_DEFINE([GNUTLS_POINTER_TO_INT_CAST], [])
-      ;;
-  esac
+   fi
 ])


hooks/post-receive
-- 
GNU gnutls