{
/* should only happen if the cancel task was already
created on 'DOWNLOAD_INACTIVE' as we were out of time */
- GNUNET_break (0 == sr->remaining_probe_time.rel_value);
+ GNUNET_break (0 == sr->remaining_probe_time.rel_value_us);
}
break;
case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
dur = GNUNET_TIME_absolute_get_duration (sr->probe_active_time);
sr->remaining_probe_time =
GNUNET_TIME_relative_subtract (sr->remaining_probe_time, dur);
- if (0 == sr->remaining_probe_time.rel_value)
+ if (0 == sr->remaining_probe_time.rel_value_us)
sr->probe_cancel_task =
GNUNET_SCHEDULER_add_now (&probe_failure_handler, sr);
GNUNET_FS_search_result_sync_ (sr);
*/
static int
decrypt_block_with_keyword (const struct GNUNET_FS_SearchContext *sc,
- const struct GNUNET_CRYPTO_EccPublicKey *dpub,
+ const struct GNUNET_CRYPTO_EccPublicSignKey *dpub,
const void *edata,
size_t edata_size,
char *data)
{
const struct GNUNET_CRYPTO_EccPrivateKey *anon;
- struct GNUNET_CRYPTO_EccPublicKey anon_pub;
+ struct GNUNET_CRYPTO_EccPublicSignKey anon_pub;
unsigned int i;
/* find key */
for (i = 0; i < sc->uri->data.ksk.keywordCount; i++)
if (0 == memcmp (dpub,
&sc->requests[i].dpub,
- sizeof (struct GNUNET_CRYPTO_EccPublicKey)))
+ sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)))
break;
if (i == sc->uri->data.ksk.keywordCount)
{
}
/* decrypt */
anon = GNUNET_CRYPTO_ecc_key_get_anonymous ();
- GNUNET_CRYPTO_ecc_key_get_public (anon, &anon_pub);
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (anon, &anon_pub);
GNUNET_FS_ublock_decrypt_ (edata, edata_size,
&anon_pub,
sc->requests[i].keyword,
const void *data,
size_t size)
{
- if (GNUNET_TIME_absolute_get_duration (expiration).rel_value > 0)
+ if (GNUNET_TIME_absolute_get_duration (expiration).rel_value_us > 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Result received has already expired.\n");
struct MessageBuilderContext mbc;
size_t msize;
struct SearchMessage *sm;
- struct GNUNET_CRYPTO_EccPublicKey dpub;
+ struct GNUNET_CRYPTO_EccPublicSignKey dpub;
unsigned int sqms;
uint32_t options;
memset (&sm->target, 0, sizeof (struct GNUNET_HashCode));
GNUNET_CRYPTO_ecc_public_key_derive (&sc->uri->data.sks.ns,
sc->uri->data.sks.identifier,
+ "fs-ublock",
&dpub);
GNUNET_CRYPTO_hash (&dpub,
sizeof (dpub),
unsigned int i;
const char *keyword;
const struct GNUNET_CRYPTO_EccPrivateKey *anon;
- struct GNUNET_CRYPTO_EccPublicKey anon_pub;
+ struct GNUNET_CRYPTO_EccPublicSignKey anon_pub;
struct SearchRequestEntry *sre;
GNUNET_assert (NULL == sc->client);
{
GNUNET_assert (0 != sc->uri->data.ksk.keywordCount);
anon = GNUNET_CRYPTO_ecc_key_get_anonymous ();
- GNUNET_CRYPTO_ecc_key_get_public (anon, &anon_pub);
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (anon, &anon_pub);
sc->requests =
GNUNET_malloc (sizeof (struct SearchRequestEntry) *
sc->uri->data.ksk.keywordCount);
sre->keyword = GNUNET_strdup (keyword);
GNUNET_CRYPTO_ecc_public_key_derive (&anon_pub,
keyword,
+ "fs-ublock",
&sre->dpub);
GNUNET_CRYPTO_hash (&sre->dpub,
- sizeof (struct GNUNET_CRYPTO_EccPublicKey),
+ sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
&sre->uquery);
sre->mandatory = (sc->uri->data.ksk.keywords[i][0] == '+');
if (sre->mandatory)