diff options
Diffstat (limited to 'src/gns/plugin_block_gns.c')
-rw-r--r-- | src/gns/plugin_block_gns.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c index aabedcaac..9b58c9034 100644 --- a/src/gns/plugin_block_gns.c +++ b/src/gns/plugin_block_gns.c | |||
@@ -145,17 +145,13 @@ block_plugin_gns_evaluate (void *cls, | |||
145 | return GNUNET_BLOCK_EVALUATION_RESULT_INVALID; | 145 | return GNUNET_BLOCK_EVALUATION_RESULT_INVALID; |
146 | } | 146 | } |
147 | block = reply_block; | 147 | block = reply_block; |
148 | if (ntohl (block->purpose.size) + sizeof(struct | 148 | if (GNUNET_GNSRECORD_block_get_size (block) > reply_block_size) |
149 | GNUNET_CRYPTO_EcdsaSignature) | ||
150 | + sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey) != | ||
151 | reply_block_size) | ||
152 | { | 149 | { |
153 | GNUNET_break_op (0); | 150 | GNUNET_break_op (0); |
154 | return GNUNET_BLOCK_EVALUATION_RESULT_INVALID; | 151 | return GNUNET_BLOCK_EVALUATION_RESULT_INVALID; |
155 | } | 152 | } |
156 | GNUNET_CRYPTO_hash (&block->derived_key, | 153 | GNUNET_GNSRECORD_query_from_block (block, |
157 | sizeof(block->derived_key), | 154 | &h); |
158 | &h); | ||
159 | if (0 != GNUNET_memcmp (&h, query)) | 155 | if (0 != GNUNET_memcmp (&h, query)) |
160 | { | 156 | { |
161 | GNUNET_break_op (0); | 157 | GNUNET_break_op (0); |
@@ -206,9 +202,8 @@ block_plugin_gns_get_key (void *cls, | |||
206 | return GNUNET_BLOCK_EVALUATION_RESULT_INVALID; | 202 | return GNUNET_BLOCK_EVALUATION_RESULT_INVALID; |
207 | } | 203 | } |
208 | block = reply_block; | 204 | block = reply_block; |
209 | GNUNET_CRYPTO_hash (&block->derived_key, | 205 | GNUNET_GNSRECORD_query_from_block (block, |
210 | sizeof(block->derived_key), | 206 | key); |
211 | key); | ||
212 | return GNUNET_OK; | 207 | return GNUNET_OK; |
213 | } | 208 | } |
214 | 209 | ||