[git] GCRYPT - branch, LIBGCRYPT-1-6-BRANCH, updated. libgcrypt-1.6.0-9-g0f75a2a

[by Werner Koch]

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  0f75a2a939cf57997a44868826ef3390f7a5c913 (commit)
       via  36214bfa8f612cd2faa4de217d1a12a8b5faadbf (commit)
       via  6133d9a041b594200c2f0fbe976dfca7e61adb0c (commit)
       via  01cdd8d0d86b00fcce0067e67635cdd5d6b738c1 (commit)
      from  fb8d8517ffb287c332ead453ab8c8f0519c6129f (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 0f75a2a939cf57997a44868826ef3390f7a5c913
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 9 19:14:09 2014 +0100

    Update NEWS.
    
    --

diff --git a/NEWS b/NEWS
index 8f43923..97fb089 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 Noteworthy changes in version 1.6.1 (unreleased)
 ------------------------------------------------
 
+ * Fix a 1.6.0 introduced regression in looking up an message digest
+   by OID.
+
+ * Fix build problem on NetBSD.
+
 
 Noteworthy changes in version 1.6.0 (2013-12-16)
 ------------------------------------------------

commit 36214bfa8f612cd2faa4de217d1a12a8b5faadbf
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 9 19:14:09 2014 +0100

    Fix macro conflict in NetBSD
    
    * cipher/bithelp.h (bswap32): Rename to _gcry_bswap32.
    (bswap64): Rename to _gcry_bswap64.
    --
    
    NetBSD provides system macros bswap32 and bswap64 which conflicts with
    our macros.  Prefixing them with _gcry_ is easier than to come up with
    a proper test.
    
    GnuPG-bug-id: 1600
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/cipher/bithelp.h b/cipher/bithelp.h
index 418bdf5..6e59c53 100644
--- a/cipher/bithelp.h
+++ b/cipher/bithelp.h
@@ -39,9 +39,10 @@ static inline u32 ror(u32 x, int n)
 /* Byte swap for 32-bit and 64-bit integers.  If available, use compiler
    provided helpers.  */
 #ifdef HAVE_BUILTIN_BSWAP32
-# define bswap32 __builtin_bswap32
+# define _gcry_bswap32 __builtin_bswap32
 #else
-static inline u32 bswap32(u32 x)
+static inline u32
+_gcry_bswap32(u32 x)
 {
 	return ((rol(x, 8) & 0x00ff00ffL) | (ror(x, 8) & 0xff00ff00L));
 }
@@ -49,29 +50,30 @@ static inline u32 bswap32(u32 x)
 
 #ifdef HAVE_U64_TYPEDEF
 # ifdef HAVE_BUILTIN_BSWAP64
-#  define bswap64 __builtin_bswap64
+#  define _gcry_bswap64 __builtin_bswap64
 # else
-static inline u64 bswap64(u64 x)
+static inline u64
+_gcry_bswap64(u64 x)
 {
-	return ((u64)bswap32(x) << 32) | (bswap32(x >> 32));
+	return ((u64)_gcry_bswap32(x) << 32) | (_gcry_bswap32(x >> 32));
 }
 # endif
 #endif
 
 /* Endian dependent byte swap operations.  */
 #ifdef WORDS_BIGENDIAN
-# define le_bswap32(x) bswap32(x)
+# define le_bswap32(x) _gcry_bswap32(x)
 # define be_bswap32(x) ((u32)(x))
 # ifdef HAVE_U64_TYPEDEF
-#  define le_bswap64(x) bswap64(x)
+#  define le_bswap64(x) _gcry_bswap64(x)
 #  define be_bswap64(x) ((u64)(x))
 # endif
 #else
 # define le_bswap32(x) ((u32)(x))
-# define be_bswap32(x) bswap32(x)
+# define be_bswap32(x) _gcry_bswap32(x)
 # ifdef HAVE_U64_TYPEDEF
 #  define le_bswap64(x) ((u64)(x))
-#  define be_bswap64(x) bswap64(x)
+#  define be_bswap64(x) _gcry_bswap64(x)
 # endif
 #endif
 

commit 6133d9a041b594200c2f0fbe976dfca7e61adb0c
Author: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date:   Tue Dec 31 00:39:56 2013 +0400

    Fix typo in search_oid
    
    * cipher/md.c (search_oid): Invert condition on oid comparison.
    
    --
    Function stricmp() returns 0 in case strings match, so proper condition
    that checks for matching OID strings should be if (!stricmp(...))
    
    Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>

diff --git a/cipher/md.c b/cipher/md.c
index d9c1ad4..1b59765 100644
--- a/cipher/md.c
+++ b/cipher/md.c
@@ -195,7 +195,7 @@ search_oid (const char *oid, gcry_md_oid_spec_t *oid_spec)
   if (spec && spec->oids)
     {
       for (i = 0; spec->oids[i].oidstring; i++)
-	if (stricmp (oid, spec->oids[i].oidstring))
+	if (!stricmp (oid, spec->oids[i].oidstring))
 	  {
 	    if (oid_spec)
 	      *oid_spec = spec->oids[i];

commit 01cdd8d0d86b00fcce0067e67635cdd5d6b738c1
Author: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
Date:   Fri Dec 27 12:37:10 2013 +0400

    Correct formatting of gcry_mac_get_algo_keylen documentation
    
    * doc/gcrypt.texi: add braces near gcry_mac_get_algo_keylen
      documentation.
    
    Use braces around unsigned int in gcry_mac_get_algo_keylen
    documentation, otherwise texinfo breaks that and uses 'int' as a
    function definition.
    
    Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>

diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index 38af0c6..7af1706 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -3767,7 +3767,7 @@ for the MAC value. On error @code{0} is returned.
 @end deftypefun
 
 
- at deftypefun unsigned int gcry_mac_get_algo_keylen (@var{algo})
+ at deftypefun {unsigned int} gcry_mac_get_algo_keylen (@var{algo})
 
 This function returns length of the key for MAC algorithm @var{algo}.  If
 the algorithm supports multiple key lengths, the default supported key

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

Summary of changes:
 NEWS             |    5 +++++
 cipher/bithelp.h |   20 +++++++++++---------
 cipher/md.c      |    2 +-
 doc/gcrypt.texi  |    2 +-
 4 files changed, 18 insertions(+), 11 deletions(-)


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