[GNUnet-SVN] r503 - in GNUnet/src/applications/fs: . ecrs

[grothoff]

Author: grothoff
Date: 2005-03-26 21:50:19 -0800 (Sat, 26 Mar 2005)
New Revision: 503

Modified:
   GNUnet/src/applications/fs/ecrs/namespace.c
   GNUnet/src/applications/fs/ecrs/namespacetest.c
   GNUnet/src/applications/fs/ecrs_core.c
Log:
namespace bugfixes

Modified: GNUnet/src/applications/fs/ecrs/namespace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespace.c 2005-03-27 05:42:12 UTC (rev 
502)
+++ GNUnet/src/applications/fs/ecrs/namespace.c 2005-03-27 05:50:19 UTC (rev 
503)
@@ -239,8 +239,6 @@
     ECRS_encryptInPlace(&hc,
                        &knb->nblock,
                        size - sizeof(KBlock) - sizeof(unsigned int));
-    printf("SIGN size: %u\n",
-          sizeof(NBlock) + mdsize);
 
     GNUNET_ASSERT(OK == sign(pk,
                             sizeof(NBlock) + mdsize,
@@ -460,10 +458,9 @@
                      - sizeof(Signature)
                      - sizeof(PublicKey)
                      - sizeof(HashCode512));
-
   /* FINALLY: sign & publish SBlock */
   GNUNET_ASSERT(OK == sign(hk,
-                          sizeof(SBlock) 
+                          size
                           - sizeof(Signature) 
                           - sizeof(PublicKey)
                           - sizeof(unsigned int),

Modified: GNUnet/src/applications/fs/ecrs/namespacetest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/namespacetest.c     2005-03-27 05:42:12 UTC 
(rev 502)
+++ GNUnet/src/applications/fs/ecrs/namespacetest.c     2005-03-27 05:50:19 UTC 
(rev 503)
@@ -95,7 +95,7 @@
                                     NULL));
   FREENONNULL(setConfigurationString("GNUNET",
                                     "LOGLEVEL",
-                                    "DEBUG"));
+                                    "NOTHING"));
   return OK;
 }
 

Modified: GNUnet/src/applications/fs/ecrs_core.c
===================================================================
--- GNUnet/src/applications/fs/ecrs_core.c      2005-03-27 05:42:12 UTC (rev 
502)
+++ GNUnet/src/applications/fs/ecrs_core.c      2005-03-27 05:50:19 UTC (rev 
503)
@@ -170,7 +170,10 @@
     }
     sb = (const SBlock*) data;
     if (OK != verifySig(&sb->identifier,
-                       size - sizeof(Signature) - sizeof(PublicKey) - 
sizeof(unsigned int),
+                       size 
+                       - sizeof(Signature) 
+                       - sizeof(PublicKey) 
+                       - sizeof(unsigned int),
                        &sb->signature,
                        &sb->subspace)) {
       BREAK();
@@ -206,7 +209,10 @@
     }
     nb = (const NBlock*) data;
     if (OK != verifySig(&nb->identifier,
-                       size - sizeof(Signature) - sizeof(PublicKey) - 
sizeof(unsigned int),
+                       size 
+                       - sizeof(Signature) 
+                       - sizeof(PublicKey)
+                       - sizeof(unsigned int),
                        &nb->signature,
                        &nb->subspace)) {
       BREAK();
@@ -222,11 +228,10 @@
       return SYSERR;
     }
     kb = (const KNBlock*) data;
-    LOG(LOG_NOTHING,
-       "VERIFY size: %u\n",
-       size - sizeof(KBlock) - sizeof(unsigned int));
     if ( (OK != verifySig(&kb->nblock,
-                         size - sizeof(KBlock) - sizeof(unsigned int),
+                         size 
+                         - sizeof(KBlock)
+                         - sizeof(unsigned int),
                          &kb->kblock.signature,
                          &kb->kblock.keyspace)) ) {
       BREAK();