aboutsummaryrefslogtreecommitdiff
path: root/src/gns/plugin_block_gns.c
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2012-03-19 18:51:32 +0000
committerMartin Schanzenbach <mschanzenbach@posteo.de>2012-03-19 18:51:32 +0000
commitd2fb255905f0c93f50db2112594307bb1265742c (patch)
treee3e9c7387e66ebae147ff4e32224baea046b5ff8 /src/gns/plugin_block_gns.c
parentcdd5f401a24438425da10a11992c2bfd9992df47 (diff)
downloadgnunet-d2fb255905f0c93f50db2112594307bb1265742c.tar.gz
gnunet-d2fb255905f0c93f50db2112594307bb1265742c.zip
-new short hashes, new short hash cmp
Diffstat (limited to 'src/gns/plugin_block_gns.c')
-rw-r--r--src/gns/plugin_block_gns.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index 19495f243..7dfaab0fa 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -63,11 +63,13 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
63 size_t reply_block_size) 63 size_t reply_block_size)
64{ 64{
65 char* name; 65 char* name;
66 GNUNET_HashCode pkey_hash; 66 GNUNET_HashCode pkey_hash_double;
67 GNUNET_HashCode query_key; 67 GNUNET_HashCode query_key;
68 GNUNET_HashCode name_hash; 68 GNUNET_HashCode name_hash_double;
69 GNUNET_HashCode mhash; 69 GNUNET_HashCode mhash;
70 GNUNET_HashCode chash; 70 GNUNET_HashCode chash;
71 struct GNUNET_CRYPTO_ShortHashCode pkey_hash;
72 struct GNUNET_CRYPTO_ShortHashCode name_hash;
71 struct GNSNameRecordBlock *nrb; 73 struct GNSNameRecordBlock *nrb;
72 uint32_t rd_count; 74 uint32_t rd_count;
73 char* rd_data = NULL; 75 char* rd_data = NULL;
@@ -95,13 +97,16 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
95 97
96 nrb = (struct GNSNameRecordBlock *)reply_block; 98 nrb = (struct GNSNameRecordBlock *)reply_block;
97 name = (char*)&nrb[1]; 99 name = (char*)&nrb[1];
98 GNUNET_CRYPTO_hash(&nrb->public_key, 100 GNUNET_CRYPTO_short_hash(&nrb->public_key,
99 sizeof(nrb->public_key), 101 sizeof(nrb->public_key),
100 &pkey_hash); 102 &pkey_hash);
101 103
102 GNUNET_CRYPTO_hash(name, strlen(name), &name_hash); 104 GNUNET_CRYPTO_short_hash(name, strlen(name), &name_hash);
105
106 GNUNET_CRYPTO_short_hash_double(&name_hash, &name_hash_double);
107 GNUNET_CRYPTO_short_hash_double(&pkey_hash, &pkey_hash_double);
103 108
104 GNUNET_CRYPTO_hash_xor(&pkey_hash, &name_hash, &query_key); 109 GNUNET_CRYPTO_hash_xor(&pkey_hash_double, &name_hash_double, &query_key);
105 110
106 struct GNUNET_CRYPTO_HashAsciiEncoded xor_exp; 111 struct GNUNET_CRYPTO_HashAsciiEncoded xor_exp;
107 struct GNUNET_CRYPTO_HashAsciiEncoded xor_got; 112 struct GNUNET_CRYPTO_HashAsciiEncoded xor_got;