[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-302-g191c2e4

[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, master has been updated
       via  191c2e4fe2dc0e00f61aa44e011a9596887e6ce1 (commit)
       via  6303b0e83856ee89374b447e710f0ab2af61caec (commit)
      from  5a78e7f15e0dd96a8bf64e2bb142880bf8ea6965 (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 191c2e4fe2dc0e00f61aa44e011a9596887e6ce1
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 15 16:10:34 2016 +0100

    Fix build problem for rndegd.c
    
    * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Test all RND modules.
    * random/rndegd.c (_gcry_rndegd_connect_socket)
    (my_make_filename): Use functions with '_' prefix.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/Makefile.am b/Makefile.am
index 4c2c509..2e7abc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 ACLOCAL_AMFLAGS = -I m4
-DISTCHECK_CONFIGURE_FLAGS = --disable-random-daemon --enable-doc
+DISTCHECK_CONFIGURE_FLAGS = --disable-random-daemon --enable-doc \
+                            --enable-random=auto
 
 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
diff --git a/random/rndegd.c b/random/rndegd.c
index d43fcbc..b87115f 100644
--- a/random/rndegd.c
+++ b/random/rndegd.c
@@ -62,7 +62,7 @@ my_make_filename (const char *first_part, const char *second_part)
       && (home = getenv("HOME")) && *home )
     n += strlen(home);
 
-  name = gcry_xmalloc(n);
+  name = _gcry_xmalloc(n);
   p = (home
        ? stpcpy (stpcpy (name, home), first_part+1 )
        : stpcpy (name, first_part) );
@@ -161,7 +161,7 @@ _gcry_rndegd_connect_socket (int nofail)
 #endif
   if (user_socket_name)
     {
-      name = gcry_strdup (user_socket_name);
+      name = _gcry_strdup (user_socket_name);
       if (!name)
         {
           if (!nofail)

commit 6303b0e83856ee89374b447e710f0ab2af61caec
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 15 16:01:35 2016 +0100

    random: Fix possible AIX problem with sysconf in rndunix.
    
    * random/rndunix.c [HAVE_STDINT_H]: Include stdint.h.
    (start_gatherer): Detect misbehaving sysconf.
    --
    
    See
    GnuPG-bug-id: 1778
    for the reason of this patch. There is no concrete bug report but this
    change should not harm.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/random/rndunix.c b/random/rndunix.c
index 315906b..2e13298 100644
--- a/random/rndunix.c
+++ b/random/rndunix.c
@@ -86,6 +86,9 @@
 #include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <string.h>
 
 /* OS-specific includes */
@@ -726,12 +729,18 @@ start_gatherer( int pipefd )
     {	int nmax, n1, n2, i;
 #ifdef _SC_OPEN_MAX
 	if( (nmax=sysconf( _SC_OPEN_MAX )) < 0 ) {
-#ifdef _POSIX_OPEN_MAX
+# ifdef _POSIX_OPEN_MAX
 	    nmax = _POSIX_OPEN_MAX;
-#else
+# else
 	    nmax = 20; /* assume a reasonable value */
-#endif
+# endif
 	}
+        /* AIX returns INT32_MAX instead of a proper value.  We assume that
+         * this is always an error and use a reasonable value.  */
+# ifdef INT32_MAX
+        if (nmax == INT32_MAX)
+          nmax = 20;
+# endif
 #else /*!_SC_OPEN_MAX*/
 	nmax = 20; /* assume a reasonable value */
 #endif /*!_SC_OPEN_MAX*/

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

Summary of changes:
 Makefile.am      |  3 ++-
 random/rndegd.c  |  4 ++--
 random/rndunix.c | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 6 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