diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-08-11 15:36:42 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-08-11 15:36:42 +0000 |
commit | b64ef35e9e4d3f43b8840bacac60ac2a91ae03f1 (patch) | |
tree | d97273f6ef88c54622e15ea1d675b7d9f2ee93a5 /src/fs/fs_search.c | |
parent | a78e015dd4764c54c013729cf58c55dbaa8af626 (diff) | |
download | gnunet-b64ef35e9e4d3f43b8840bacac60ac2a91ae03f1.tar.gz gnunet-b64ef35e9e4d3f43b8840bacac60ac2a91ae03f1.zip |
-add extra context argument for key deriviation, so that fs and gads do not collide
Diffstat (limited to 'src/fs/fs_search.c')
-rw-r--r-- | src/fs/fs_search.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c index a0fec03a1..9bc254254 100644 --- a/src/fs/fs_search.c +++ b/src/fs/fs_search.c | |||
@@ -1104,6 +1104,7 @@ transmit_search_request (void *cls, size_t size, void *buf) | |||
1104 | memset (&sm->target, 0, sizeof (struct GNUNET_HashCode)); | 1104 | memset (&sm->target, 0, sizeof (struct GNUNET_HashCode)); |
1105 | GNUNET_CRYPTO_ecc_public_key_derive (&sc->uri->data.sks.ns, | 1105 | GNUNET_CRYPTO_ecc_public_key_derive (&sc->uri->data.sks.ns, |
1106 | sc->uri->data.sks.identifier, | 1106 | sc->uri->data.sks.identifier, |
1107 | "fs-ublock", | ||
1107 | &dpub); | 1108 | &dpub); |
1108 | GNUNET_CRYPTO_hash (&dpub, | 1109 | GNUNET_CRYPTO_hash (&dpub, |
1109 | sizeof (dpub), | 1110 | sizeof (dpub), |
@@ -1290,6 +1291,7 @@ GNUNET_FS_search_start_searching_ (struct GNUNET_FS_SearchContext *sc) | |||
1290 | sre->keyword = GNUNET_strdup (keyword); | 1291 | sre->keyword = GNUNET_strdup (keyword); |
1291 | GNUNET_CRYPTO_ecc_public_key_derive (&anon_pub, | 1292 | GNUNET_CRYPTO_ecc_public_key_derive (&anon_pub, |
1292 | keyword, | 1293 | keyword, |
1294 | "fs-ublock", | ||
1293 | &sre->dpub); | 1295 | &sre->dpub); |
1294 | GNUNET_CRYPTO_hash (&sre->dpub, | 1296 | GNUNET_CRYPTO_hash (&sre->dpub, |
1295 | sizeof (struct GNUNET_CRYPTO_EccPublicKey), | 1297 | sizeof (struct GNUNET_CRYPTO_EccPublicKey), |