X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_strings_to_data.c;h=a0521cf708cb957758206f34ad56689a8e8db588;hb=fdbe690beeec04066f18302401096eb5212c3f6a;hp=d98cd8578294ba41c5b077e9c57b6bd389957dd9;hpb=54dd5929eee0166d44b7bc34a96bc11d287217fe;p=oweals%2Fgnunet.git

diff --git a/src/util/test_strings_to_data.c b/src/util/test_strings_to_data.c
index d98cd8578..a0521cf70 100644
--- a/src/util/test_strings_to_data.c
+++ b/src/util/test_strings_to_data.c
@@ -22,38 +22,40 @@
  * @brief testcase for strings.c
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_crypto_lib.h"
-#include "gnunet_strings_lib.h"
+#include "gnunet_util_lib.h"
 
 
 int
 main (int argc, char *argv[])
 {
-	GNUNET_log_setup ("util", "DEBUG", NULL);
-	char *conv;
-	char buf[255];
-	char *end;
-	struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded src;
-	struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded dest;
-
-	memset (&src, '\1', sizeof (src));
-	memset (&dest, '\2', sizeof (dest));
-
-	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));
-
-	conv = GNUNET_CRYPTO_ecc_public_key_to_string (&src);
-	GNUNET_assert (NULL != conv);
-	fprintf (stderr, "Key `%s'\n",conv);
-
-
-  GNUNET_assert (GNUNET_OK == GNUNET_STRINGS_string_to_data (conv, strlen (conv), (unsigned char *) &dest, sizeof (dest)));
-  GNUNET_assert (0 == memcmp (&src, &dest, sizeof (dest)));
-
-	return 0;
+  char buf[1024];
+  char *end;
+  char src[128];
+  char dst[128];
+  unsigned int i;
+  int ret = 0;
+
+  GNUNET_log_setup ("util", "DEBUG", NULL);
+  for (i=0;i<sizeof(src);i++)
+  {
+    memset (src, i, sizeof (src));
+    memset (dst, i+1, sizeof (dst));
+
+    end = GNUNET_STRINGS_data_to_string (&src, i, buf, sizeof (buf));
+    GNUNET_assert (NULL != end);
+    end[0] = '\0';
+    if (GNUNET_OK !=
+	GNUNET_STRINGS_string_to_data (buf, strlen (buf), dst, i))
+    {
+      fprintf (stderr, "%u failed decode (%u bytes)\n", i, (unsigned int) strlen (buf));
+      ret = 1;
+    } else if (0 != memcmp (src, dst, i))
+    {
+      fprintf (stderr, "%u wrong decode (%u bytes)\n", i, (unsigned int) strlen (buf));
+      ret = 1;
+    }
+  }
+  return ret;
 }