[git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-447-g953535a

[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, master has been updated
       via  953535a7de68cf62b5b1ad6f96ea3a9edd83762c (commit)
       via  5c31990214b58c4e17edb01fbbe6d9f573975a22 (commit)
      from  110fed2d6b0bbc97cb5cc0a3a564e05fc42afa2d (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 953535a7de68cf62b5b1ad6f96ea3a9edd83762c
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Mon Dec 16 12:15:37 2013 +0200

    Change dummy variable in mpih-div.c to mpi_limb_t type
    
    * mpi/mpih-div.c (_gcry_mpih_mod_1, _gcry_mpih_divmod_1): Change dummy
    variable to 'mpi_limb_t' type from 'int'.
    --
    
    Patch attempts to fix problem reported by Matthias Wachs:
    
     while updating our buildbots I got another compile error:
    
     On a OS X machine:
    
     Darwin luke.net.in.tum.de 11.3.0 Darwin Kernel Version 11.3.0: Thu Jan
     12 18:47:41 PST 2012; root:xnu-1699.24.23~1/RELEASE_X86_64 x86_64
    
     /bin/sh ../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I.
     -I..  -I../src -I../src -I/opt/local/include -I/opt/local/include -g -O2
     -Wall -MT mpih-div.lo -MD -MP -MF .deps/mpih-div.Tpo -c -o mpih-div.lo
     mpih-div.c
     libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -I../src -I../src
     -I/opt/local/include -I/opt/local/include -g -O2 -Wall -MT mpih-div.lo
     -MD -MP -MF .deps/mpih-div.Tpo -c mpih-div.c  -fno-common -DPIC -o
     .libs/mpih-div.o
     mpih-div.c: In function '_gcry_mpih_mod_1':
     mpih-div.c:183: error: unsupported inline asm: input constraint with a
     matching output constraint of incompatible type!
     make[2]: *** [mpih-div.lo] Error 1
     make[1]: *** [all-recursive] Error 1
     make: *** [all] Error 2
    
    The new x86-64 inline assembly for MPI expects outputs to be limb sized
    variables (64-bit), but mpi/mpih-div.c was using 32-bit dummy variable.
    Appearently this mismatch between assembly output and variable sizes does not
    fail on every platform.
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/mpi/mpih-div.c b/mpi/mpih-div.c
index 0bddd22..57c1b58 100644
--- a/mpi/mpih-div.c
+++ b/mpi/mpih-div.c
@@ -48,7 +48,7 @@ _gcry_mpih_mod_1(mpi_ptr_t dividend_ptr, mpi_size_t dividend_size,
 {
     mpi_size_t i;
     mpi_limb_t n1, n0, r;
-    int dummy GCC_ATTR_UNUSED;
+    mpi_limb_t dummy GCC_ATTR_UNUSED;
 
     /* Botch: Should this be handled at all?  Rely on callers?	*/
     if( !dividend_size )
@@ -396,7 +396,7 @@ _gcry_mpih_divmod_1( mpi_ptr_t quot_ptr,
 {
     mpi_size_t i;
     mpi_limb_t n1, n0, r;
-    int dummy GCC_ATTR_UNUSED;
+    mpi_limb_t dummy GCC_ATTR_UNUSED;
 
     if( !dividend_size )
 	return 0;

commit 5c31990214b58c4e17edb01fbbe6d9f573975a22
Author: Jussi Kivilinna <jussi.kivilinna at iki.fi>
Date:   Mon Dec 16 11:54:37 2013 +0200

    Remove duplicate gcry_mac_hd_t typedef
    
    * cipher/mac-internal.h (gcry_mac_hd_t): Remove.
    --
    
    Attempt to fix problem reported by Matthias Wachs:
    
     On a freebsd 9.1 amd64 and a debian Lenny x86 system:
    
     In file included from mac.c:27:
     mac-internal.h:22: error: redefinition of typedef 'gcry_mac_hd_t'
     ../src/gcrypt.h:1301: error: previous declaration of 'gcry_mac_hd_t' was
     here
     *** [mac.lo] Error code 1
    
    Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>

diff --git a/cipher/mac-internal.h b/cipher/mac-internal.h
index 2a5e7c6..6fc304b 100644
--- a/cipher/mac-internal.h
+++ b/cipher/mac-internal.h
@@ -19,7 +19,6 @@
 
 /* The data object used to hold a handle to an encryption object.  */
 struct gcry_mac_handle;
-typedef struct gcry_mac_handle *gcry_mac_hd_t;
 
 
 /*

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

Summary of changes:
 cipher/mac-internal.h |    1 -
 mpi/mpih-div.c        |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)


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


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits