[git] GCRYPT - branch, master, updated. libgcrypt-1.7.3-121-gde1e125

[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  de1e12504dd72bbedd3441be9aab3cad6dbca251 (commit)
       via  9d99c6b973caa7fdf93b53cf764066214f763803 (commit)
      from  61b0f52c1cc85bf8c3cac9aba40e28682e4e1b8b (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 de1e12504dd72bbedd3441be9aab3cad6dbca251
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jul 17 14:04:30 2017 +0200

    build: Bump LT version to C22/A2/R0.
    
    --
    
    This is required to allow installation of 1.7 and 1.8.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/configure.ac b/configure.ac
index d36673f..9aa89c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,12 +51,13 @@ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
 AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org])
 
 # LT Version numbers, remember to change them just *before* a release.
+# !!!NOTE: Already updated for 1.8.0 !!
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBGCRYPT_LT_CURRENT=21
-LIBGCRYPT_LT_AGE=1
-LIBGCRYPT_LT_REVISION=3
+LIBGCRYPT_LT_CURRENT=22
+LIBGCRYPT_LT_AGE=2
+LIBGCRYPT_LT_REVISION=0
 
 
 # If the API is changed in an incompatible way: increment the next counter.

commit 9d99c6b973caa7fdf93b53cf764066214f763803
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jul 17 12:34:13 2017 +0200

    random: Minor fix for getting the rndjent version.
    
    * random/rndjent.c (_gcry_rndjent_get_version): Always set R_ACTIVE.
    * tests/version.c (test_get_config): Check number of fields for
    rng-type.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/random/rndjent.c b/random/rndjent.c
index b1432e4..6e56c8a 100644
--- a/random/rndjent.c
+++ b/random/rndjent.c
@@ -327,6 +327,8 @@ _gcry_rndjent_poll (void (*add)(const void*, size_t, enum random_origins),
 unsigned int
 _gcry_rndjent_get_version (int *r_active)
 {
+  if (r_active)
+    *r_active = 0;
 #ifdef USE_JENT
   if ( is_rng_available () )
     {
diff --git a/tests/version.c b/tests/version.c
index 6a01610..7e68cd6 100644
--- a/tests/version.c
+++ b/tests/version.c
@@ -43,6 +43,8 @@ static void
 test_get_config (void)
 {
   char *string;
+  const char *s;
+  int i;
 
   string = gcry_get_config (0, NULL);
   if (!string)
@@ -81,6 +83,21 @@ test_get_config (void)
     fail ("gcry_get_config(\"no-such-item\") returned wrong error: %s\n",
           gpg_strerror (gpg_error_from_syserror ()));
 
+  /* Check the rng-type.  */
+  xfree (string);
+  string = gcry_get_config (0, "rng-type");
+  if (!string)
+    fail ("gcry_get_config(\"rng-type\") not returned\n");
+  else
+    {
+      for (i=0, s = string; *s; s++)
+        if (*s == ':')
+          i++;
+      if (i < 5)
+        fail ("gcry_get_config(\"rng-type\") has not enough fields\n");
+    }
+
+
   xfree (string);
 }
 

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

Summary of changes:
 configure.ac     |  7 ++++---
 random/rndjent.c |  2 ++
 tests/version.c  | 17 +++++++++++++++++
 3 files changed, 23 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