[GNUnet-SVN] r20401 - gnunet/src/namestore

[gnunet]

Author: wachs
Date: 2012-03-09 13:04:06 +0100 (Fri, 09 Mar 2012)
New Revision: 20401

Modified:
   gnunet/src/namestore/test_namestore_api_zone_iteration.c
   gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
Log:
- mod test_case


Modified: gnunet/src/namestore/test_namestore_api_zone_iteration.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration.c    2012-03-09 
12:03:29 UTC (rev 20400)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration.c    2012-03-09 
12:04:06 UTC (rev 20401)
@@ -219,6 +219,13 @@
   }
   else
   {
+    /* verify signature returned from name store */
+    if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature(zone_key, name, 
rd_count, rd, signature))
+    {
+      failed = GNUNET_YES;
+      GNUNET_break (0);
+    }
+
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing results name %s \n", name);
     if (0 == strcmp (name, s_name_1))
     {
@@ -277,6 +284,12 @@
         failed = GNUNET_YES;
         GNUNET_break (0);
       }
+      if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature(zone_key, name, 
rd_count, rd, signature))
+      {
+        failed = GNUNET_YES;
+        GNUNET_break (0);
+      }
+
       if (0 != memcmp (signature, sig_3, sizeof (struct 
GNUNET_CRYPTO_RsaSignature)))
       {
         failed = GNUNET_YES;
@@ -432,7 +445,7 @@
   /* name in different zone */
   GNUNET_asprintf(&s_name_3, "dummy3");
   s_rd_3 = create_record(1);
-  sig_3 = GNUNET_NAMESTORE_create_signature(privkey, s_name_3, s_rd_3, 1);
+  sig_3 = GNUNET_NAMESTORE_create_signature(privkey2, s_name_3, s_rd_3, 1);
   GNUNET_NAMESTORE_record_put (nsh, &pubkey2, s_name_3, 
GNUNET_TIME_absolute_get_forever(), 1, s_rd_3, sig_3, &put_cont, NULL);
 }
 

Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c       
2012-03-09 12:03:29 UTC (rev 20400)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c       
2012-03-09 12:04:06 UTC (rev 20401)
@@ -224,6 +224,15 @@
   }
   else
   {
+
+    /* verify signature returned from name store */
+    if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature(zone_key, name, 
rd_count, rd, signature))
+    {
+      failed = GNUNET_YES;
+      GNUNET_break (0);
+    }
+
+
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing results name %s \n", name);
     if (0 == strcmp (name, s_name_1))
     { /* name_1 */
@@ -261,8 +270,8 @@
         failed = GNUNET_YES;
         GNUNET_break (0);
       }
-      GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_verify_signature(&pubkey2, 
s_name_2, rd_count, rd, sig_2));
-      if (0 != memcmp (signature, sig_2, sizeof (struct 
GNUNET_CRYPTO_RsaSignature)))
+
+      if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature(&pubkey2, s_name_2, 
1, s_rd_2, signature))
       {
         failed = GNUNET_YES;
         GNUNET_break (0);