[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-300-g5a78e7f

[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  5a78e7f15e0dd96a8bf64e2bb142880bf8ea6965 (commit)
       via  a5a87d2b8627314593b06d19018484a7f7701227 (commit)
      from  b384f1a10cbf806cc889f5929b489a6c9efc0bd1 (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 5a78e7f15e0dd96a8bf64e2bb142880bf8ea6965
Author: Werner Koch <wk at gnupg.org>
Date:   Sun Dec 27 12:39:45 2015 +0100

    random: Take at max 25% from RDRAND
    
    * random/rndlinux.c (_gcry_rndlinux_gather_random): Change use of
    RDRAND from 50% to 25%.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/random/rndlinux.c b/random/rndlinux.c
index 9eeec57..0cb65df 100644
--- a/random/rndlinux.c
+++ b/random/rndlinux.c
@@ -139,10 +139,18 @@ _gcry_rndlinux_gather_random (void (*add)(const void*, size_t,
 
 
   /* First read from a hardware source.  However let it account only
-     for up to 50% of the requested bytes.  */
+     for up to 50% (or 25% for RDRAND) of the requested bytes.  */
   n_hw = _gcry_rndhw_poll_slow (add, origin);
-  if (n_hw > length/2)
-    n_hw = length/2;
+  if ((_gcry_get_hw_features () & HWF_INTEL_RDRAND))
+    {
+      if (n_hw > length/4)
+        n_hw = length/4;
+    }
+  else
+    {
+      if (n_hw > length/2)
+        n_hw = length/2;
+    }
   if (length > 1)
     length -= n_hw;
 

commit a5a87d2b8627314593b06d19018484a7f7701227
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 2 15:05:19 2015 +0200

    doc: Typo fix and .gitignore addition.
    
    --

diff --git a/.gitignore b/.gitignore
index 3929e4d..b961614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,6 +72,7 @@ tests/benchmark
 tests/fips186-dsa
 tests/fipsdrv
 tests/gchash
+tests/hashtest-256g
 tests/hmac
 tests/keygen
 tests/keygrip
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index f60be77..39c7c9f 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -381,7 +381,7 @@ memory is not a problem, you should initialize Libgcrypt this way:
 
 @example
   /* Version check should be the very first call because it
-     makes sure that important subsystems are intialized. */
+     makes sure that important subsystems are initialized. */
   if (!gcry_check_version (GCRYPT_VERSION))
     @{
       fputs ("libgcrypt version mismatch\n", stderr);

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

Summary of changes:
 .gitignore        |  1 +
 doc/gcrypt.texi   |  2 +-
 random/rndlinux.c | 14 +++++++++++---
 3 files changed, 13 insertions(+), 4 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