diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-10-09 14:52:47 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-10-09 14:52:47 +0200 |
commit | df344790f7f2e7c39cfd951ce373c4ec52b6cda7 (patch) | |
tree | 8a750f455dd227e167aa18f47c7c17d8d58665e8 /src | |
parent | 44f8117be5a2aca8b303943ff016927a35621ed9 (diff) | |
download | gnunet-df344790f7f2e7c39cfd951ce373c4ec52b6cda7.tar.gz gnunet-df344790f7f2e7c39cfd951ce373c4ec52b6cda7.zip |
-fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/identity-provider/gnunet-service-identity-provider.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/src/identity-provider/gnunet-service-identity-provider.c b/src/identity-provider/gnunet-service-identity-provider.c index 364c097b5..6d99e8467 100644 --- a/src/identity-provider/gnunet-service-identity-provider.c +++ b/src/identity-provider/gnunet-service-identity-provider.c | |||
@@ -1257,7 +1257,7 @@ ticket_reissue_proc (void *cls, | |||
1257 | &reissue_ticket_cont, | 1257 | &reissue_ticket_cont, |
1258 | rh); | 1258 | rh); |
1259 | for (; i > 0; i--) | 1259 | for (; i > 0; i--) |
1260 | GNUNET_free (attr_arr[i]); | 1260 | GNUNET_free (attr_arr[i-1]); |
1261 | GNUNET_free (ecdhe_privkey); | 1261 | GNUNET_free (ecdhe_privkey); |
1262 | GNUNET_free (label); | 1262 | GNUNET_free (label); |
1263 | GNUNET_free (attr_arr); | 1263 | GNUNET_free (attr_arr); |
@@ -1322,7 +1322,9 @@ reenc_next_attribute (struct TicketRevocationHandle *rh) | |||
1322 | attribute_serialize (rh->attrs->list_head->attribute, | 1322 | attribute_serialize (rh->attrs->list_head->attribute, |
1323 | buf); | 1323 | buf); |
1324 | rh->attrs->list_head->attribute->attribute_version++; | 1324 | rh->attrs->list_head->attribute->attribute_version++; |
1325 | GNUNET_asprintf (&policy, "%s:%lu", rh->attrs->list_head->attribute->name, rh->attrs->list_head->attribute->attribute_version); | 1325 | GNUNET_asprintf (&policy, "%s:%lu", |
1326 | rh->attrs->list_head->attribute->name, | ||
1327 | rh->attrs->list_head->attribute->attribute_version); | ||
1326 | /** | 1328 | /** |
1327 | * Encrypt the attribute value and store in namestore | 1329 | * Encrypt the attribute value and store in namestore |
1328 | */ | 1330 | */ |
@@ -1423,6 +1425,21 @@ process_attributes_to_update (void *cls, | |||
1423 | } | 1425 | } |
1424 | 1426 | ||
1425 | 1427 | ||
1428 | |||
1429 | static void | ||
1430 | get_ticket_after_abe_bootstrap (void *cls, | ||
1431 | struct GNUNET_CRYPTO_AbeMasterKey *abe_key) | ||
1432 | { | ||
1433 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1434 | "Finished ABE bootstrap\n"); | ||
1435 | struct TicketRevocationHandle *rh = cls; | ||
1436 | rh->abe_key = abe_key; | ||
1437 | TKT_database->get_ticket_attributes (TKT_database->cls, | ||
1438 | &rh->ticket, | ||
1439 | &process_attributes_to_update, | ||
1440 | rh); | ||
1441 | } | ||
1442 | |||
1426 | /** | 1443 | /** |
1427 | * Checks a ticket revocation message | 1444 | * Checks a ticket revocation message |
1428 | * | 1445 | * |
@@ -1444,7 +1461,6 @@ check_revoke_ticket_message(void *cls, | |||
1444 | } | 1461 | } |
1445 | return GNUNET_OK; | 1462 | return GNUNET_OK; |
1446 | } | 1463 | } |
1447 | |||
1448 | /** | 1464 | /** |
1449 | * | 1465 | * |
1450 | * Handler for ticket revocation message | 1466 | * Handler for ticket revocation message |
@@ -1477,11 +1493,7 @@ handle_revoke_ticket_message (void *cls, | |||
1477 | GNUNET_CONTAINER_DLL_insert (idp->revocation_list_head, | 1493 | GNUNET_CONTAINER_DLL_insert (idp->revocation_list_head, |
1478 | idp->revocation_list_tail, | 1494 | idp->revocation_list_tail, |
1479 | rh); | 1495 | rh); |
1480 | TKT_database->get_ticket_attributes (TKT_database->cls, | 1496 | bootstrap_abe (&rh->identity, &get_ticket_after_abe_bootstrap, rh, GNUNET_NO); |
1481 | &rh->ticket, | ||
1482 | &process_attributes_to_update, | ||
1483 | rh); | ||
1484 | //bootstrap_abe (&rh->identity, &collect_after_abe_bootstrap, rh, GNUNET_NO); | ||
1485 | GNUNET_SERVICE_client_continue (idp->client); | 1497 | GNUNET_SERVICE_client_continue (idp->client); |
1486 | 1498 | ||
1487 | } | 1499 | } |