[GNUnet-SVN] r26571 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2013-03-22 14:46:08 +0100 (Fri, 22 Mar 2013)
New Revision: 26571

Modified:
   gnunet/src/util/crypto_ecc.c
   gnunet/src/util/strings.c
   gnunet/src/util/test_strings_to_data.c
Log:
-cleanup

Modified: gnunet/src/util/crypto_ecc.c
===================================================================
--- gnunet/src/util/crypto_ecc.c        2013-03-22 11:08:21 UTC (rev 26570)
+++ gnunet/src/util/crypto_ecc.c        2013-03-22 13:46:08 UTC (rev 26571)
@@ -216,8 +216,8 @@
     return GNUNET_SYSERR;
 
   if (GNUNET_OK != GNUNET_STRINGS_string_to_data (enc, enclen,
-                                                (unsigned char*) pub,
-                                                sizeof (struct 
GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)))
+                                                 pub,
+                                                 sizeof (struct 
GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)))
     return GNUNET_SYSERR;
   if ( (ntohs (pub->size) != sizeof (struct 
GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)) ||
        (ntohs (pub->len) > GNUNET_CRYPTO_ECC_SIGNATURE_DATA_ENCODING_LENGTH) )

Modified: gnunet/src/util/strings.c
===================================================================
--- gnunet/src/util/strings.c   2013-03-22 11:08:21 UTC (rev 26570)
+++ gnunet/src/util/strings.c   2013-03-22 13:46:08 UTC (rev 26571)
@@ -804,6 +804,8 @@
     vbit -= 5;
   }
   GNUNET_assert (vbit == 0);
+  if (wpos < out_size)
+    out[wpos] = '\0';
   return &out[wpos];
 }
 

Modified: gnunet/src/util/test_strings_to_data.c
===================================================================
--- gnunet/src/util/test_strings_to_data.c      2013-03-22 11:08:21 UTC (rev 
26570)
+++ gnunet/src/util/test_strings_to_data.c      2013-03-22 13:46:08 UTC (rev 
26571)
@@ -40,7 +40,7 @@
        memset (&src, '\1', sizeof (src));
        memset (&dest, '\2', sizeof (dest));
 
-       end = GNUNET_STRINGS_data_to_string (&src, sizeof (src), buf, 255);
+       end = GNUNET_STRINGS_data_to_string (&src, sizeof (src), buf, sizeof 
(buf));
        end[0] = '\0';
        fprintf (stderr, "Key `%s'\n",buf);
        GNUNET_assert (GNUNET_OK == GNUNET_CRYPTO_ecc_public_key_from_string 
(buf, strlen (buf), &dest));