From 84592357d1610fb2923798fb975b202d7260f971 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 6 Oct 2010 11:17:16 +0000
Subject: [PATCH] indicate malformed blocks

---
 src/block/plugin_block_dht.c   |  6 +++---
 src/block/plugin_block_fs.c    | 22 +++++++++++-----------
 src/include/gnunet_block_lib.h |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/block/plugin_block_dht.c b/src/block/plugin_block_dht.c
index 56f99a765..c636f00c2 100644
--- a/src/block/plugin_block_dht.c
+++ b/src/block/plugin_block_dht.c
@@ -104,7 +104,7 @@ block_plugin_dht_get_key (void *cls,
 		       "block-dht",
 		       _("Block not of type %u\n"),
 		       GNUNET_BLOCK_TYPE_DHT_HELLO);
-      return GNUNET_SYSERR;
+      return GNUNET_NO;
     }
   msg = block;
   if (block_size != ntohs (msg->size))
@@ -113,7 +113,7 @@ block_plugin_dht_get_key (void *cls,
 		       "block-dht",
 		       _("Size mismatch for block\n"),
 		       GNUNET_BLOCK_TYPE_DHT_HELLO);
-      return GNUNET_SYSERR;
+      return GNUNET_NO;
     }
   hello = block;
   pid = (struct GNUNET_PeerIdentity*) key;
@@ -125,7 +125,7 @@ block_plugin_dht_get_key (void *cls,
 		       "block-dht",
 		       _("Block of type %u is malformed\n"),
 		       GNUNET_BLOCK_TYPE_DHT_HELLO);
-      return GNUNET_SYSERR;
+      return GNUNET_NO;
     }
   return GNUNET_OK;
 }
diff --git a/src/block/plugin_block_fs.c b/src/block/plugin_block_fs.c
index d4e510abe..248878765 100644
--- a/src/block/plugin_block_fs.c
+++ b/src/block/plugin_block_fs.c
@@ -194,7 +194,7 @@ block_plugin_fs_get_key (void *cls,
       if (block_size < sizeof (struct KBlock))
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       kb = block;
       if (block_size - sizeof (struct KBlock) !=
@@ -203,7 +203,7 @@ block_plugin_fs_get_key (void *cls,
 	  - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) ) 
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       if (GNUNET_OK !=
 	  GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_KBLOCK,
@@ -212,7 +212,7 @@ block_plugin_fs_get_key (void *cls,
 				    &kb->keyspace)) 
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       if (key != NULL)
 	GNUNET_CRYPTO_hash (&kb->keyspace,
@@ -223,14 +223,14 @@ block_plugin_fs_get_key (void *cls,
       if (block_size < sizeof (struct SBlock))
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       sb = block;
       if (block_size !=
 	  ntohl (sb->purpose.size) + sizeof (struct GNUNET_CRYPTO_RsaSignature))
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       if (GNUNET_OK !=
 	  GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_SBLOCK,
@@ -239,7 +239,7 @@ block_plugin_fs_get_key (void *cls,
 				    &sb->subspace)) 
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       if (key != NULL)
 	*key = sb->identifier;
@@ -248,7 +248,7 @@ block_plugin_fs_get_key (void *cls,
       if (block_size < sizeof (struct NBlock))
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       nb = block;
       if (block_size - sizeof (struct NBlock) !=
@@ -257,13 +257,13 @@ block_plugin_fs_get_key (void *cls,
 	  - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) ) 
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       if (block_size !=
 	  ntohl (nb->ksk_purpose.size) + sizeof (struct GNUNET_CRYPTO_RsaSignature))
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       if (GNUNET_OK !=
 	  GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK_KSIG,
@@ -272,7 +272,7 @@ block_plugin_fs_get_key (void *cls,
 				    &nb->keyspace)) 
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       if (GNUNET_OK !=
 	  GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK,
@@ -281,7 +281,7 @@ block_plugin_fs_get_key (void *cls,
 				    &nb->subspace)) 
 	{
 	  GNUNET_break_op (0);
-	  return GNUNET_SYSERR;
+	  return GNUNET_NO;
 	}
       /* FIXME: we used to xor ID with NSID,
 	 why not here? */
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index 18cb7b7f3..15119f445 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -219,7 +219,7 @@ GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx,
  * @param block_size number of bytes in block
  * @param key set to the key (query) for the given block
  * @return GNUNET_OK on success, 
- *         GNUNET_NO if the block is malformed, FIXME: cg!
+ *         GNUNET_NO if the block is malformed
  *         GNUNET_SYSERR if type not supported
  *         (or if extracting a key from a block of this type does not work)
  */
-- 
2.25.1