[git] GCRYPT - branch, LIBGCRYPT-1-6-BRANCH, updated. libgcrypt-1.6.5-4-g5369520

[by Jussi Kivilinna]

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 "The GNU crypto library".

The branch, LIBGCRYPT-1-6-BRANCH has been updated
       via  53695204acb315deb10705ad35f133815418aa8b (commit)
       via  2ea6ce6b0e9b644f7db4df49f08726c7cbfefeac (commit)
      from  72b0d74103fef216479f97f9d5fe23e95f6b3ccc (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 53695204acb315deb10705ad35f133815418aa8b
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Wed Apr 29 18:18:07 2015 +0300

    Disable building mpi assembly routines on WIN64
    
    * mpi/config.links: Disable assembly for host 'x86_64-*mingw32*'.
    --
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
    (cherry picked from commit e78560a4b717f7154f910a8ce4128de152f586da)

diff --git a/mpi/config.links b/mpi/config.links
index 9500f08..477774c 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -134,6 +134,11 @@ case "${host}" in
 	path="amd64"
         mpi_cpu_arch="x86"
 	;;
+    x86_64-*mingw32*)
+	echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
+	path=""
+	mpi_cpu_arch="x86"
+        ;;
     x86_64-*-*)
 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h

commit 2ea6ce6b0e9b644f7db4df49f08726c7cbfefeac
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Wed Apr 29 18:18:07 2015 +0300

    Fix rndhw for 64-bit Windows build
    
    * configure.ac: Add sizeof check for 'void *'.
    * random/rndhw.c (poll_padlock): Check for SIZEOF_VOID_P == 8
    instead of defined(__LP64__).
    (RDRAND_LONG): Check for SIZEOF_UNSIGNED_LONG == 8 instead of
    defined(__LP64__).
    --
    
    __LP64__ is not predefined for 64-bit mingw64-gcc, which caused wrong
    assembly code selections. Do selection based on type sizes instead,
    to support x86_64, x32 and win64 properly.
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
    (cherry picked from commit d5a7e00b6b222566a5650639ef29684b047c1909)

diff --git a/configure.ac b/configure.ac
index b58fd6b..75d3a06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -341,6 +341,7 @@ AC_CHECK_SIZEOF(unsigned short, 2)
 AC_CHECK_SIZEOF(unsigned int, 4)
 AC_CHECK_SIZEOF(unsigned long, 4)
 AC_CHECK_SIZEOF(unsigned long long, 0)
+AC_CHECK_SIZEOF(void *, 0)
 
 AC_TYPE_UINTPTR_T
 
diff --git a/random/rndhw.c b/random/rndhw.c
index e625512..8e50751 100644
--- a/random/rndhw.c
+++ b/random/rndhw.c
@@ -69,7 +69,7 @@ poll_padlock (void (*add)(const void*, size_t, enum random_origins),
   nbytes = 0;
   while (nbytes < 64)
     {
-#if defined(__x86_64__) && defined(__LP64__)
+#if defined(__x86_64__) && SIZEOF_VOID_P == 8
       asm volatile
         ("movq %1, %%rdi\n\t"         /* Set buffer.  */
          "xorq %%rdx, %%rdx\n\t"      /* Request up to 8 bytes.  */
@@ -123,7 +123,7 @@ poll_padlock (void (*add)(const void*, size_t, enum random_origins),
 #ifdef USE_DRNG
 # define RDRAND_RETRY_LOOPS	10
 # define RDRAND_INT	".byte 0x0f,0xc7,0xf0"
-# if defined(__x86_64__) && defined(__LP64__)
+# if defined(__x86_64__) && SIZEOF_UNSIGNED_LONG == 8
 #  define RDRAND_LONG	".byte 0x48,0x0f,0xc7,0xf0"
 # else
 #  define RDRAND_LONG	RDRAND_INT

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

Summary of changes:
 configure.ac     | 1 +
 mpi/config.links | 5 +++++
 random/rndhw.c   | 4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org