diff options
Diffstat (limited to 'src/fs/fs_publish_ksk.c')
-rw-r--r-- | src/fs/fs_publish_ksk.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fs/fs_publish_ksk.c b/src/fs/fs_publish_ksk.c index bbbbdc1d6..93eee7d72 100644 --- a/src/fs/fs_publish_ksk.c +++ b/src/fs/fs_publish_ksk.c | |||
@@ -172,8 +172,8 @@ publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
172 | struct GNUNET_HashCode query; | 172 | struct GNUNET_HashCode query; |
173 | struct GNUNET_CRYPTO_AesSessionKey skey; | 173 | struct GNUNET_CRYPTO_AesSessionKey skey; |
174 | struct GNUNET_CRYPTO_AesInitializationVector iv; | 174 | struct GNUNET_CRYPTO_AesInitializationVector iv; |
175 | struct GNUNET_PseudonymHandle *ph; | 175 | struct GNUNET_FS_PseudonymHandle *ph; |
176 | struct GNUNET_PseudonymIdentifier pseudonym; | 176 | struct GNUNET_FS_PseudonymIdentifier pseudonym; |
177 | 177 | ||
178 | pkc->ksk_task = GNUNET_SCHEDULER_NO_TASK; | 178 | pkc->ksk_task = GNUNET_SCHEDULER_NO_TASK; |
179 | if ((pkc->i == pkc->ksk_uri->data.ksk.keywordCount) || (NULL == pkc->dsh)) | 179 | if ((pkc->i == pkc->ksk_uri->data.ksk.keywordCount) || (NULL == pkc->dsh)) |
@@ -198,24 +198,24 @@ publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
198 | 1 + pkc->slen + pkc->mdsize, | 198 | 1 + pkc->slen + pkc->mdsize, |
199 | &skey, &iv, | 199 | &skey, &iv, |
200 | &pkc->cpy[1]); | 200 | &pkc->cpy[1]); |
201 | ph = GNUNET_PSEUDONYM_get_anonymous_pseudonym_handle (); | 201 | ph = GNUNET_FS_pseudonym_get_anonymous_pseudonym_handle (); |
202 | GNUNET_CRYPTO_hash (&key, sizeof (key), &signing_key); | 202 | GNUNET_CRYPTO_hash (&key, sizeof (key), &signing_key); |
203 | pkc->cpy->purpose.size = htonl (1 + pkc->slen + pkc->mdsize + sizeof (struct UBlock) | 203 | pkc->cpy->purpose.size = htonl (1 + pkc->slen + pkc->mdsize + sizeof (struct UBlock) |
204 | - sizeof (struct GNUNET_PseudonymSignature)); | 204 | - sizeof (struct GNUNET_FS_PseudonymSignature)); |
205 | pkc->cpy->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_FS_UBLOCK); | 205 | pkc->cpy->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_FS_UBLOCK); |
206 | GNUNET_PSEUDONYM_sign (ph, | 206 | GNUNET_FS_pseudonym_sign (ph, |
207 | &pkc->cpy->purpose, | 207 | &pkc->cpy->purpose, |
208 | &seed, | 208 | &seed, |
209 | &signing_key, | 209 | &signing_key, |
210 | &pkc->cpy->signature); | 210 | &pkc->cpy->signature); |
211 | GNUNET_PSEUDONYM_get_identifier (ph, &pseudonym); | 211 | GNUNET_FS_pseudonym_get_identifier (ph, &pseudonym); |
212 | GNUNET_PSEUDONYM_derive_verification_key (&pseudonym, | 212 | GNUNET_FS_pseudonym_derive_verification_key (&pseudonym, |
213 | &signing_key, | 213 | &signing_key, |
214 | &pkc->cpy->verification_key); | 214 | &pkc->cpy->verification_key); |
215 | GNUNET_CRYPTO_hash (&pkc->cpy->verification_key, | 215 | GNUNET_CRYPTO_hash (&pkc->cpy->verification_key, |
216 | sizeof (pkc->cpy->verification_key), | 216 | sizeof (pkc->cpy->verification_key), |
217 | &query); | 217 | &query); |
218 | GNUNET_PSEUDONYM_destroy (ph); | 218 | GNUNET_FS_pseudonym_destroy (ph); |
219 | pkc->qre = | 219 | pkc->qre = |
220 | GNUNET_DATASTORE_put (pkc->dsh, 0, &query, | 220 | GNUNET_DATASTORE_put (pkc->dsh, 0, &query, |
221 | 1 + pkc->slen + pkc->mdsize + sizeof (struct UBlock), | 221 | 1 + pkc->slen + pkc->mdsize + sizeof (struct UBlock), |
@@ -311,7 +311,7 @@ GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h, | |||
311 | 311 | ||
312 | pkc->cpy = GNUNET_malloc (size); | 312 | pkc->cpy = GNUNET_malloc (size); |
313 | pkc->cpy->purpose.size = | 313 | pkc->cpy->purpose.size = |
314 | htonl (sizeof (struct GNUNET_PseudonymSignaturePurpose) + | 314 | htonl (sizeof (struct GNUNET_FS_PseudonymSignaturePurpose) + |
315 | pkc->mdsize + pkc->slen + 1); | 315 | pkc->mdsize + pkc->slen + 1); |
316 | pkc->cpy->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_FS_UBLOCK); | 316 | pkc->cpy->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_FS_UBLOCK); |
317 | pkc->ksk_uri = GNUNET_FS_uri_dup (ksk_uri); | 317 | pkc->ksk_uri = GNUNET_FS_uri_dup (ksk_uri); |