Fixed eddsa test case.

diff --git a/ChangeLog b/ChangeLog
index f611ea2fef04cb8bc72e260030c99b2eddc109ef..57de0f759dfaca8fa2ff5eb3eb876c1e80361da9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-24  Niels Möller  <nisse@lysator.liu.se>
+
+       * testsuite/eddsa-verify-test.c (test_eddsa): Fixed test case bug,
+       showing up as use of uninitialized data with valgrind.
+
 2014-10-23  Niels Möller  <nisse@lysator.liu.se>
 
        * examples/nettle-benchmark.c (time_memxor): Allocate buffers as

diff --git a/testsuite/eddsa-verify-test.c b/testsuite/eddsa-verify-test.c
index 39f972a34ee8c46f85ba6b12c7631cabdb475436..7eb445a262c6c73d4036de4e5b940d433f702043 100644 (file)
--- a/testsuite/eddsa-verify-test.c
+++ b/testsuite/eddsa-verify-test.c
@@ -87,11 +87,10 @@ test_eddsa (const struct ecc_curve *ecc,
       goto fail;
     }
 
-  memcpy (csignature, signature, 2*nbytes);
   if (msg->length == 0)
     {
       if (_eddsa_verify  (ecc, H, pub, A, ctx,
-                         3, "foo", csignature, scratch))
+                         3, "foo", signature, scratch))
        {
          fprintf (stderr,
                   "ecdsa_verify unexpectedly succeeded with different message.\n");
@@ -102,16 +101,16 @@ test_eddsa (const struct ecc_curve *ecc,
     {
       if (_eddsa_verify  (ecc, H, pub, A, ctx,
                          msg->length - 1, msg->data,
-                         csignature, scratch))
+                         signature, scratch))
        {
          fprintf (stderr,
                   "ecdsa_verify unexpectedly succeeded with truncated message.\n");
          goto fail;
        }
-      memcpy (csignature, signature, 2*nbytes);
+      memcpy (cmsg, msg->data, msg->length);
       cmsg[2*msg->length / 3] ^= 0x20;
       if (_eddsa_verify  (ecc, H, pub, A, ctx,
-                         msg->length, cmsg, csignature, scratch))
+                         msg->length, cmsg, signature, scratch))
        {
          fprintf (stderr,
                   "ecdsa_verify unexpectedly succeeded with modified message.\n");