[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-67-g246b7aa

[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  246b7aaae1ee459f440260bbc4ec2c01c5dc3362 (commit)
       via  42f097486eb1ab92f30fdab56865eec4af685def (commit)
      from  fc6ff6f73a51bcbbbb3757dc1386da40aa3ae75d (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 246b7aaae1ee459f440260bbc4ec2c01c5dc3362
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 9 12:35:15 2014 +0200

    mpi: Fix a subtle bug setting spurious bits with in mpi_set_bit.
    
    * mpi/mpi-bit.c (_gcry_mpi_set_bit, _gcry_mpi_set_highbit): Clear
    allocated but not used bits before resizing.
    * tests/t-mpi-bits.c (set_bit_with_resize): New.
    --
    
    Reported-by: Martin Sewelies.
    
    This bug is probably with us for many years.  Probably due to
    different memory allocation patterns, it did first revealed itself
    with 1.6.  It could be the reason for other heisenbugs.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/mpi/mpi-bit.c b/mpi/mpi-bit.c
index fcafda0..e217040 100644
--- a/mpi/mpi-bit.c
+++ b/mpi/mpi-bit.c
@@ -116,7 +116,7 @@ _gcry_mpi_test_bit( gcry_mpi_t a, unsigned int n )
 void
 _gcry_mpi_set_bit( gcry_mpi_t a, unsigned int n )
 {
-  unsigned int limbno, bitno;
+  unsigned int i, limbno, bitno;
 
   if (mpi_is_immutable (a))
     {
@@ -129,6 +129,8 @@ _gcry_mpi_set_bit( gcry_mpi_t a, unsigned int n )
 
   if ( limbno >= a->nlimbs )
     {
+      for (i=a->nlimbs; i < a->alloced; i++)
+        a->d[i] = 0;
       mpi_resize (a, limbno+1 );
       a->nlimbs = limbno+1;
     }
@@ -141,7 +143,7 @@ _gcry_mpi_set_bit( gcry_mpi_t a, unsigned int n )
 void
 _gcry_mpi_set_highbit( gcry_mpi_t a, unsigned int n )
 {
-  unsigned int limbno, bitno;
+  unsigned int i, limbno, bitno;
 
   if (mpi_is_immutable (a))
     {
@@ -154,6 +156,8 @@ _gcry_mpi_set_highbit( gcry_mpi_t a, unsigned int n )
 
   if ( limbno >= a->nlimbs )
     {
+      for (i=a->nlimbs; i < a->alloced; i++)
+        a->d[i] = 0;
       mpi_resize (a, limbno+1 );
       a->nlimbs = limbno+1;
     }
diff --git a/tests/t-mpi-bit.c b/tests/t-mpi-bit.c
index b1c999e..3d7b793 100644
--- a/tests/t-mpi-bit.c
+++ b/tests/t-mpi-bit.c
@@ -327,6 +327,58 @@ test_lshift (int pass)
 }
 
 
+/* Bug fixed on 2014-05-09:
+      a = gcry_mpi_new (1523);
+      gcry_mpi_set_bit (a, 1536);
+      didn't initialized all limbs in A.  */
+static void
+set_bit_with_resize (void)
+{
+  gcry_mpi_t a;
+  int i;
+
+  wherestr = "set_bit_with_resize";
+  show ("checking that set_bit initializes all limbs\n");
+
+  a = gcry_mpi_new (1536);
+  gcry_mpi_set_bit (a, 1536);
+
+  if (!gcry_mpi_test_bit (a, 1536))
+    fail ("failed to set a bit\n");
+  for (i=0; i < 1536; i++)
+    {
+      if (gcry_mpi_test_bit (a, i))
+        {
+          fail ("spurious bit detected\n");
+          break;
+        }
+    }
+  if (gcry_mpi_test_bit (a, 1537))
+    fail ("more bits set than expected\n");
+  gcry_mpi_release (a);
+
+  wherestr = "set_highbit_with_resize";
+  show ("checking that set_highbit initializes all limbs\n");
+
+  a = gcry_mpi_new (1536);
+  gcry_mpi_set_highbit (a, 1536);
+
+  if (!gcry_mpi_test_bit (a, 1536))
+    fail ("failed to set a bit\n");
+  for (i=0; i < 1536; i++)
+    {
+      if (gcry_mpi_test_bit (a, i))
+        {
+          fail ("spurious bit detected\n");
+          break;
+        }
+    }
+  if (gcry_mpi_test_bit (a, 1537))
+    fail ("more bits set than expected\n");
+  gcry_mpi_release (a);
+}
+
+
 int
 main (int argc, char **argv)
 {
@@ -356,6 +408,8 @@ main (int argc, char **argv)
   for (i=0; i < 5; i++)
     test_lshift (i); /* Run several times due to random initializations. */
 
+  set_bit_with_resize ();
+
   show ("All tests completed. Errors: %d\n", error_count);
   return error_count ? 1 : 0;
 }

commit 42f097486eb1ab92f30fdab56865eec4af685def
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 9 12:11:30 2014 +0200

    Comment typo fix
    
    --

diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c
index 1f1754a..fdce578 100644
--- a/mpi/mpiutil.c
+++ b/mpi/mpiutil.c
@@ -28,7 +28,7 @@
 #include "mpi-internal.h"
 #include "mod-source-info.h"
 
-/* Constatns allocated right away at strtartup.  */
+/* Constants allocated right away at startup.  */
 static gcry_mpi_t constants[MPI_NUMBER_OF_CONSTANTS];
 
 

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

Summary of changes:
 mpi/mpi-bit.c     |    8 ++++++--
 mpi/mpiutil.c     |    2 +-
 tests/t-mpi-bit.c |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 61 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