*/
#define BLOOMFILTER_K 16
-//Not taken until now
-#define GNUNET_BLOCK_TYPE_GNS_NAMERECORD 11
-
/**
* Function called to validate a reply or a request. For
* request evaluation, simply pass "NULL" for the reply_block.
*/
static enum GNUNET_BLOCK_EvaluationResult
block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
- const GNUNET_HashCode * query,
+ const struct GNUNET_HashCode * query,
struct GNUNET_CONTAINER_BloomFilter **bf,
int32_t bf_mutator, const void *xquery,
size_t xquery_size, const void *reply_block,
size_t reply_block_size)
{
- if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
- return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
-
char* name;
- GNUNET_HashCode pkey_hash;
- GNUNET_HashCode query_pkey;
- GNUNET_HashCode name_hash;
- GNUNET_HashCode mhash;
- GNUNET_HashCode chash;
+ struct GNUNET_HashCode pkey_hash_double;
+ struct GNUNET_HashCode query_key;
+ struct GNUNET_HashCode name_hash_double;
+ struct GNUNET_HashCode mhash;
+ struct GNUNET_HashCode chash;
+ struct GNUNET_CRYPTO_ShortHashCode pkey_hash;
+ struct GNUNET_CRYPTO_ShortHashCode name_hash;
struct GNSNameRecordBlock *nrb;
- struct GNSRecordBlock *rb;
uint32_t rd_count;
+ char* rd_data = NULL;
+ int rd_len;
+ uint32_t record_xquery;
+ unsigned int record_match;
+
+ //GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "RB SIZE %d\n", reply_block_size);
- nrb = (struct GNSNameRecordBlock *)reply_block;
+ if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
+ return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
+ if (reply_block == NULL)
+ {
+ /**
+ * check if request is valid
+ * FIXME we could check for the record types here
+ **/
+ if (xquery_size < sizeof(uint32_t))
+ {
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
+ }
+ return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
+ }
+
+ /* this is a reply */
+ nrb = (struct GNSNameRecordBlock *)reply_block;
name = (char*)&nrb[1];
-
- GNUNET_CRYPTO_hash(&nrb->public_key,
- sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ GNUNET_CRYPTO_short_hash(&nrb->public_key,
+ sizeof(nrb->public_key),
&pkey_hash);
- GNUNET_CRYPTO_hash(name, strlen(name), &name_hash);
-
- GNUNET_CRYPTO_hash_xor(query, &name_hash, &query_pkey);
+ GNUNET_CRYPTO_short_hash(name, strlen(name), &name_hash);
- //Check query key against public key
- if (0 != GNUNET_CRYPTO_hash_cmp(&query_pkey, &pkey_hash))
- return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
+ GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
+ GNUNET_CRYPTO_short_hash_double(&pkey_hash, &pkey_hash_double);
- rd_count = ntohl(nrb->rd_count);
+ GNUNET_CRYPTO_hash_xor(&pkey_hash_double, &name_hash_double, &query_key);
+
+ struct GNUNET_CRYPTO_HashAsciiEncoded xor_exp;
+ struct GNUNET_CRYPTO_HashAsciiEncoded xor_got;
+ GNUNET_CRYPTO_hash_to_enc (&query_key, &xor_exp);
+ GNUNET_CRYPTO_hash_to_enc (query, &xor_got);
- struct GNUNET_NAMESTORE_RecordData rd[rd_count];
- int i = 0;
- int record_match = 0;
- rb = (struct GNSRecordBlock*)(&nrb[1] + strlen(name) + 1);
+ //GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ // "BLOCK_TEST for %s got %s expected %s\n",
+ // name, (char*) &xor_got, (char*) &xor_exp);
- for (i=0; i<rd_count; i++)
+ /* Check query key against public key */
+ if (0 != GNUNET_CRYPTO_hash_cmp(query, &query_key))
{
- rd[i].record_type = ntohl(rb->type);
- rd[i].expiration =
- GNUNET_TIME_absolute_ntoh(rb->expiration);
- rd[i].data_size = ntohl(rb->data_length);
- rd[i].flags = ntohl(rb->flags);
- rd[i].data = (char*)&rb[1];
- rb = &rb[1] + rd[i].data_size;
- if (xquery_size > 0 && (rd[i].record_type == *((uint32_t*)xquery)))
- record_match++;
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
}
- //No record matches query
- if (xquery_size > 0 && (record_match == 0))
- return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
-
- if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature (&nrb->public_key,
- name,
- nrb->rd_count,
- rd,
- &nrb->signature))
+ record_match = 0;
+ rd_count = ntohl(nrb->rd_count);
+ rd_data = (char*)&nrb[1];
+ rd_data += strlen(name) + 1;
+ rd_len = reply_block_size - (strlen(name) + 1
+ + sizeof(struct GNSNameRecordBlock));
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Signature invalid\n");
- return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
- }
+ struct GNUNET_NAMESTORE_RecordData rd[rd_count];
+ unsigned int i;
+ uint64_t exp = UINT64_MAX;
+ struct GNUNET_TIME_Absolute et = GNUNET_TIME_UNIT_FOREVER_ABS;
+
+ if (GNUNET_SYSERR == GNUNET_NAMESTORE_records_deserialize (rd_len,
+ rd_data,
+ rd_count,
+ rd))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Data invalid (%d bytes, %d records)\n", rd_len, rd_count);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+ }
+
+ if (xquery_size < sizeof(uint32_t))
+ record_xquery = 0;
+ else
+ record_xquery = ntohl(*((uint32_t*)xquery));
+
+ for (i=0; i<rd_count; i++)
+ {
+ GNUNET_break (0 == (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+ exp = GNUNET_MIN (exp, rd[i].expiration_time);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Got record of size %d expiration %u\n",
+ rd[i].data_size, rd[i].expiration_time);
+ if ((record_xquery != 0)
+ && (rd[i].record_type == record_xquery))
+ {
+ record_match++;
+ }
+ }
+ et.abs_value = exp;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Verifying signature of %d records for name %s with expiration of %u\n",
+ rd_count, name, et.abs_value);
- //FIXME do bf check before or after crypto??
+ if (GNUNET_OK != GNUNET_NAMESTORE_verify_signature (&nrb->public_key,
+ et,
+ name,
+ rd_count,
+ rd,
+ &nrb->signature))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Signature invalid for %s\n", name);
+ GNUNET_break_op (0);
+ return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+ }
+ }
+
if (NULL != bf)
{
GNUNET_CRYPTO_hash(reply_block, reply_block_size, &chash);
}
GNUNET_CONTAINER_bloomfilter_add(*bf, &mhash);
}
-
- return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
+ return GNUNET_BLOCK_EVALUATION_OK_MORE;
}
static int
block_plugin_gns_get_key (void *cls, enum GNUNET_BLOCK_Type type,
const void *block, size_t block_size,
- GNUNET_HashCode * key)
+ struct GNUNET_HashCode * key)
{
if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
- return GNUNET_NO;
- GNUNET_HashCode name_hash;
- GNUNET_HashCode pkey_hash;
+ return GNUNET_SYSERR;
+ struct GNUNET_CRYPTO_ShortHashCode name_hash;
+ struct GNUNET_CRYPTO_ShortHashCode pkey_hash;
+ struct GNUNET_HashCode name_hash_double;
+ struct GNUNET_HashCode pkey_hash_double;
+
struct GNSNameRecordBlock *nrb = (struct GNSNameRecordBlock *)block;
- GNUNET_CRYPTO_hash(&nrb[1], strlen((char*)&nrb[1]), &name_hash);
- GNUNET_CRYPTO_hash(&nrb->public_key,
+ GNUNET_CRYPTO_short_hash(&nrb[1], strlen((char*)&nrb[1]), &name_hash);
+ GNUNET_CRYPTO_short_hash(&nrb->public_key,
sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
&pkey_hash);
+
+ GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
+ GNUNET_CRYPTO_short_hash_double(&pkey_hash, &pkey_hash_double);
- GNUNET_CRYPTO_hash_xor(&name_hash, &pkey_hash, key);
+ GNUNET_CRYPTO_hash_xor(&name_hash_double, &pkey_hash_double, key);
- //FIXME calculate key from name and hash(pkey) here
return GNUNET_OK;
}