aboutsummaryrefslogtreecommitdiff
path: root/src/block
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-10-06 11:17:16 +0000
committerChristian Grothoff <christian@grothoff.org>2010-10-06 11:17:16 +0000
commit84592357d1610fb2923798fb975b202d7260f971 (patch)
tree6cea2119c92a5dcb476035b6ae4874e0709c62d3 /src/block
parentf75170c496938724d523a8b934e051fe326c4637 (diff)
downloadgnunet-84592357d1610fb2923798fb975b202d7260f971.tar.gz
gnunet-84592357d1610fb2923798fb975b202d7260f971.zip
indicate malformed blocks
Diffstat (limited to 'src/block')
-rw-r--r--src/block/plugin_block_dht.c6
-rw-r--r--src/block/plugin_block_fs.c22
2 files changed, 14 insertions, 14 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,
104 "block-dht", 104 "block-dht",
105 _("Block not of type %u\n"), 105 _("Block not of type %u\n"),
106 GNUNET_BLOCK_TYPE_DHT_HELLO); 106 GNUNET_BLOCK_TYPE_DHT_HELLO);
107 return GNUNET_SYSERR; 107 return GNUNET_NO;
108 } 108 }
109 msg = block; 109 msg = block;
110 if (block_size != ntohs (msg->size)) 110 if (block_size != ntohs (msg->size))
@@ -113,7 +113,7 @@ block_plugin_dht_get_key (void *cls,
113 "block-dht", 113 "block-dht",
114 _("Size mismatch for block\n"), 114 _("Size mismatch for block\n"),
115 GNUNET_BLOCK_TYPE_DHT_HELLO); 115 GNUNET_BLOCK_TYPE_DHT_HELLO);
116 return GNUNET_SYSERR; 116 return GNUNET_NO;
117 } 117 }
118 hello = block; 118 hello = block;
119 pid = (struct GNUNET_PeerIdentity*) key; 119 pid = (struct GNUNET_PeerIdentity*) key;
@@ -125,7 +125,7 @@ block_plugin_dht_get_key (void *cls,
125 "block-dht", 125 "block-dht",
126 _("Block of type %u is malformed\n"), 126 _("Block of type %u is malformed\n"),
127 GNUNET_BLOCK_TYPE_DHT_HELLO); 127 GNUNET_BLOCK_TYPE_DHT_HELLO);
128 return GNUNET_SYSERR; 128 return GNUNET_NO;
129 } 129 }
130 return GNUNET_OK; 130 return GNUNET_OK;
131} 131}
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,
194 if (block_size < sizeof (struct KBlock)) 194 if (block_size < sizeof (struct KBlock))
195 { 195 {
196 GNUNET_break_op (0); 196 GNUNET_break_op (0);
197 return GNUNET_SYSERR; 197 return GNUNET_NO;
198 } 198 }
199 kb = block; 199 kb = block;
200 if (block_size - sizeof (struct KBlock) != 200 if (block_size - sizeof (struct KBlock) !=
@@ -203,7 +203,7 @@ block_plugin_fs_get_key (void *cls,
203 - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) ) 203 - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) )
204 { 204 {
205 GNUNET_break_op (0); 205 GNUNET_break_op (0);
206 return GNUNET_SYSERR; 206 return GNUNET_NO;
207 } 207 }
208 if (GNUNET_OK != 208 if (GNUNET_OK !=
209 GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_KBLOCK, 209 GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_KBLOCK,
@@ -212,7 +212,7 @@ block_plugin_fs_get_key (void *cls,
212 &kb->keyspace)) 212 &kb->keyspace))
213 { 213 {
214 GNUNET_break_op (0); 214 GNUNET_break_op (0);
215 return GNUNET_SYSERR; 215 return GNUNET_NO;
216 } 216 }
217 if (key != NULL) 217 if (key != NULL)
218 GNUNET_CRYPTO_hash (&kb->keyspace, 218 GNUNET_CRYPTO_hash (&kb->keyspace,
@@ -223,14 +223,14 @@ block_plugin_fs_get_key (void *cls,
223 if (block_size < sizeof (struct SBlock)) 223 if (block_size < sizeof (struct SBlock))
224 { 224 {
225 GNUNET_break_op (0); 225 GNUNET_break_op (0);
226 return GNUNET_SYSERR; 226 return GNUNET_NO;
227 } 227 }
228 sb = block; 228 sb = block;
229 if (block_size != 229 if (block_size !=
230 ntohl (sb->purpose.size) + sizeof (struct GNUNET_CRYPTO_RsaSignature)) 230 ntohl (sb->purpose.size) + sizeof (struct GNUNET_CRYPTO_RsaSignature))
231 { 231 {
232 GNUNET_break_op (0); 232 GNUNET_break_op (0);
233 return GNUNET_SYSERR; 233 return GNUNET_NO;
234 } 234 }
235 if (GNUNET_OK != 235 if (GNUNET_OK !=
236 GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_SBLOCK, 236 GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_SBLOCK,
@@ -239,7 +239,7 @@ block_plugin_fs_get_key (void *cls,
239 &sb->subspace)) 239 &sb->subspace))
240 { 240 {
241 GNUNET_break_op (0); 241 GNUNET_break_op (0);
242 return GNUNET_SYSERR; 242 return GNUNET_NO;
243 } 243 }
244 if (key != NULL) 244 if (key != NULL)
245 *key = sb->identifier; 245 *key = sb->identifier;
@@ -248,7 +248,7 @@ block_plugin_fs_get_key (void *cls,
248 if (block_size < sizeof (struct NBlock)) 248 if (block_size < sizeof (struct NBlock))
249 { 249 {
250 GNUNET_break_op (0); 250 GNUNET_break_op (0);
251 return GNUNET_SYSERR; 251 return GNUNET_NO;
252 } 252 }
253 nb = block; 253 nb = block;
254 if (block_size - sizeof (struct NBlock) != 254 if (block_size - sizeof (struct NBlock) !=
@@ -257,13 +257,13 @@ block_plugin_fs_get_key (void *cls,
257 - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) ) 257 - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) )
258 { 258 {
259 GNUNET_break_op (0); 259 GNUNET_break_op (0);
260 return GNUNET_SYSERR; 260 return GNUNET_NO;
261 } 261 }
262 if (block_size != 262 if (block_size !=
263 ntohl (nb->ksk_purpose.size) + sizeof (struct GNUNET_CRYPTO_RsaSignature)) 263 ntohl (nb->ksk_purpose.size) + sizeof (struct GNUNET_CRYPTO_RsaSignature))
264 { 264 {
265 GNUNET_break_op (0); 265 GNUNET_break_op (0);
266 return GNUNET_SYSERR; 266 return GNUNET_NO;
267 } 267 }
268 if (GNUNET_OK != 268 if (GNUNET_OK !=
269 GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK_KSIG, 269 GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK_KSIG,
@@ -272,7 +272,7 @@ block_plugin_fs_get_key (void *cls,
272 &nb->keyspace)) 272 &nb->keyspace))
273 { 273 {
274 GNUNET_break_op (0); 274 GNUNET_break_op (0);
275 return GNUNET_SYSERR; 275 return GNUNET_NO;
276 } 276 }
277 if (GNUNET_OK != 277 if (GNUNET_OK !=
278 GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK, 278 GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK,
@@ -281,7 +281,7 @@ block_plugin_fs_get_key (void *cls,
281 &nb->subspace)) 281 &nb->subspace))
282 { 282 {
283 GNUNET_break_op (0); 283 GNUNET_break_op (0);
284 return GNUNET_SYSERR; 284 return GNUNET_NO;
285 } 285 }
286 /* FIXME: we used to xor ID with NSID, 286 /* FIXME: we used to xor ID with NSID,
287 why not here? */ 287 why not here? */