diff options
Diffstat (limited to 'src/reclaim/gnunet-service-reclaim_tickets.c')
-rw-r--r-- | src/reclaim/gnunet-service-reclaim_tickets.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c index 4dd8100f9..0b1730bec 100644 --- a/src/reclaim/gnunet-service-reclaim_tickets.c +++ b/src/reclaim/gnunet-service-reclaim_tickets.c | |||
@@ -86,12 +86,12 @@ struct RECLAIM_TICKETS_ConsumeHandle | |||
86 | /** | 86 | /** |
87 | * Audience Key | 87 | * Audience Key |
88 | */ | 88 | */ |
89 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 89 | struct GNUNET_IDENTITY_PrivateKey identity; |
90 | 90 | ||
91 | /** | 91 | /** |
92 | * Audience Key | 92 | * Audience Key |
93 | */ | 93 | */ |
94 | struct GNUNET_CRYPTO_EcdsaPublicKey identity_pub; | 94 | struct GNUNET_IDENTITY_PublicKey identity_pub; |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * Lookup DLL | 97 | * Lookup DLL |
@@ -180,7 +180,7 @@ struct TicketIssueHandle | |||
180 | /** | 180 | /** |
181 | * Issuer Key | 181 | * Issuer Key |
182 | */ | 182 | */ |
183 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 183 | struct GNUNET_IDENTITY_PrivateKey identity; |
184 | 184 | ||
185 | /** | 185 | /** |
186 | * Ticket to issue | 186 | * Ticket to issue |
@@ -263,7 +263,7 @@ struct RECLAIM_TICKETS_RevokeHandle | |||
263 | /** | 263 | /** |
264 | * Issuer Key | 264 | * Issuer Key |
265 | */ | 265 | */ |
266 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 266 | struct GNUNET_IDENTITY_PrivateKey identity; |
267 | 267 | ||
268 | /** | 268 | /** |
269 | * Callback | 269 | * Callback |
@@ -490,7 +490,7 @@ rvk_ticket_update_finished (void *cls) | |||
490 | */ | 490 | */ |
491 | static void | 491 | static void |
492 | rvk_ticket_update (void *cls, | 492 | rvk_ticket_update (void *cls, |
493 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 493 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
494 | const char *label, | 494 | const char *label, |
495 | unsigned int rd_count, | 495 | unsigned int rd_count, |
496 | const struct GNUNET_GNSRECORD_Data *rd) | 496 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -665,7 +665,7 @@ move_attr_finished (void *cls, int32_t success, const char *emsg) | |||
665 | */ | 665 | */ |
666 | static void | 666 | static void |
667 | rvk_move_attr_cb (void *cls, | 667 | rvk_move_attr_cb (void *cls, |
668 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 668 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
669 | const char *label, | 669 | const char *label, |
670 | unsigned int rd_count, | 670 | unsigned int rd_count, |
671 | const struct GNUNET_GNSRECORD_Data *rd) | 671 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -850,7 +850,7 @@ remove_ticket_cont (void *cls, int32_t success, const char *emsg) | |||
850 | */ | 850 | */ |
851 | static void | 851 | static void |
852 | revoke_attrs_cb (void *cls, | 852 | revoke_attrs_cb (void *cls, |
853 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 853 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
854 | const char *label, | 854 | const char *label, |
855 | unsigned int rd_count, | 855 | unsigned int rd_count, |
856 | const struct GNUNET_GNSRECORD_Data *rd) | 856 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -913,7 +913,7 @@ rvk_attrs_err_cb (void *cls) | |||
913 | */ | 913 | */ |
914 | struct RECLAIM_TICKETS_RevokeHandle * | 914 | struct RECLAIM_TICKETS_RevokeHandle * |
915 | RECLAIM_TICKETS_revoke (const struct GNUNET_RECLAIM_Ticket *ticket, | 915 | RECLAIM_TICKETS_revoke (const struct GNUNET_RECLAIM_Ticket *ticket, |
916 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 916 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
917 | RECLAIM_TICKETS_RevokeCallback cb, | 917 | RECLAIM_TICKETS_RevokeCallback cb, |
918 | void *cb_cls) | 918 | void *cb_cls) |
919 | { | 919 | { |
@@ -925,7 +925,7 @@ RECLAIM_TICKETS_revoke (const struct GNUNET_RECLAIM_Ticket *ticket, | |||
925 | rvk->cb_cls = cb_cls; | 925 | rvk->cb_cls = cb_cls; |
926 | rvk->identity = *identity; | 926 | rvk->identity = *identity; |
927 | rvk->ticket = *ticket; | 927 | rvk->ticket = *ticket; |
928 | GNUNET_CRYPTO_ecdsa_key_get_public (&rvk->identity, &rvk->ticket.identity); | 928 | GNUNET_IDENTITY_key_get_public (&rvk->identity, &rvk->ticket.identity); |
929 | /** Get shared attributes **/ | 929 | /** Get shared attributes **/ |
930 | label = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd, | 930 | label = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd, |
931 | sizeof(ticket->rnd)); | 931 | sizeof(ticket->rnd)); |
@@ -1184,7 +1184,7 @@ lookup_authz_cb (void *cls, | |||
1184 | * @return handle to the operation | 1184 | * @return handle to the operation |
1185 | */ | 1185 | */ |
1186 | struct RECLAIM_TICKETS_ConsumeHandle * | 1186 | struct RECLAIM_TICKETS_ConsumeHandle * |
1187 | RECLAIM_TICKETS_consume (const struct GNUNET_CRYPTO_EcdsaPrivateKey *id, | 1187 | RECLAIM_TICKETS_consume (const struct GNUNET_IDENTITY_PrivateKey *id, |
1188 | const struct GNUNET_RECLAIM_Ticket *ticket, | 1188 | const struct GNUNET_RECLAIM_Ticket *ticket, |
1189 | RECLAIM_TICKETS_ConsumeCallback cb, | 1189 | RECLAIM_TICKETS_ConsumeCallback cb, |
1190 | void *cb_cls) | 1190 | void *cb_cls) |
@@ -1195,7 +1195,7 @@ RECLAIM_TICKETS_consume (const struct GNUNET_CRYPTO_EcdsaPrivateKey *id, | |||
1195 | cth = GNUNET_new (struct RECLAIM_TICKETS_ConsumeHandle); | 1195 | cth = GNUNET_new (struct RECLAIM_TICKETS_ConsumeHandle); |
1196 | 1196 | ||
1197 | cth->identity = *id; | 1197 | cth->identity = *id; |
1198 | GNUNET_CRYPTO_ecdsa_key_get_public (&cth->identity, &cth->identity_pub); | 1198 | GNUNET_IDENTITY_key_get_public (&cth->identity, &cth->identity_pub); |
1199 | cth->attrs = GNUNET_new (struct GNUNET_RECLAIM_AttributeList); | 1199 | cth->attrs = GNUNET_new (struct GNUNET_RECLAIM_AttributeList); |
1200 | cth->presentations = GNUNET_new (struct GNUNET_RECLAIM_PresentationList); | 1200 | cth->presentations = GNUNET_new (struct GNUNET_RECLAIM_PresentationList); |
1201 | cth->ticket = *ticket; | 1201 | cth->ticket = *ticket; |
@@ -1453,7 +1453,7 @@ filter_tickets_error_cb (void *cls) | |||
1453 | */ | 1453 | */ |
1454 | static void | 1454 | static void |
1455 | filter_tickets_cb (void *cls, | 1455 | filter_tickets_cb (void *cls, |
1456 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 1456 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
1457 | const char *label, | 1457 | const char *label, |
1458 | unsigned int rd_count, | 1458 | unsigned int rd_count, |
1459 | const struct GNUNET_GNSRECORD_Data *rd) | 1459 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -1489,7 +1489,7 @@ filter_tickets_cb (void *cls, | |||
1489 | // cmp audience | 1489 | // cmp audience |
1490 | if (0 == memcmp (&tih->ticket.audience, | 1490 | if (0 == memcmp (&tih->ticket.audience, |
1491 | &ticket->audience, | 1491 | &ticket->audience, |
1492 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey))) | 1492 | sizeof(struct GNUNET_IDENTITY_PublicKey))) |
1493 | { | 1493 | { |
1494 | tih->ticket = *ticket; | 1494 | tih->ticket = *ticket; |
1495 | continue; | 1495 | continue; |
@@ -1602,7 +1602,7 @@ filter_tickets_finished_cb (void *cls) | |||
1602 | { | 1602 | { |
1603 | struct TicketIssueHandle *tih = cls; | 1603 | struct TicketIssueHandle *tih = cls; |
1604 | 1604 | ||
1605 | GNUNET_CRYPTO_ecdsa_key_get_public (&tih->identity, &tih->ticket.identity); | 1605 | GNUNET_IDENTITY_key_get_public (&tih->identity, &tih->ticket.identity); |
1606 | GNUNET_RECLAIM_id_generate (&tih->ticket.rnd); | 1606 | GNUNET_RECLAIM_id_generate (&tih->ticket.rnd); |
1607 | issue_ticket (tih); | 1607 | issue_ticket (tih); |
1608 | } | 1608 | } |
@@ -1620,9 +1620,9 @@ filter_tickets_finished_cb (void *cls) | |||
1620 | * FIXME: Return handle?? | 1620 | * FIXME: Return handle?? |
1621 | */ | 1621 | */ |
1622 | void | 1622 | void |
1623 | RECLAIM_TICKETS_issue (const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 1623 | RECLAIM_TICKETS_issue (const struct GNUNET_IDENTITY_PrivateKey *identity, |
1624 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 1624 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
1625 | const struct GNUNET_CRYPTO_EcdsaPublicKey *audience, | 1625 | const struct GNUNET_IDENTITY_PublicKey *audience, |
1626 | RECLAIM_TICKETS_TicketResult cb, | 1626 | RECLAIM_TICKETS_TicketResult cb, |
1627 | void *cb_cls) | 1627 | void *cb_cls) |
1628 | { | 1628 | { |
@@ -1680,7 +1680,7 @@ cleanup_iter (struct RECLAIM_TICKETS_Iterator *iter) | |||
1680 | */ | 1680 | */ |
1681 | static void | 1681 | static void |
1682 | collect_tickets_cb (void *cls, | 1682 | collect_tickets_cb (void *cls, |
1683 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 1683 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
1684 | const char *label, | 1684 | const char *label, |
1685 | unsigned int rd_count, | 1685 | unsigned int rd_count, |
1686 | const struct GNUNET_GNSRECORD_Data *rd) | 1686 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -1765,7 +1765,7 @@ RECLAIM_TICKETS_iteration_stop (struct RECLAIM_TICKETS_Iterator *iter) | |||
1765 | */ | 1765 | */ |
1766 | struct RECLAIM_TICKETS_Iterator * | 1766 | struct RECLAIM_TICKETS_Iterator * |
1767 | RECLAIM_TICKETS_iteration_start ( | 1767 | RECLAIM_TICKETS_iteration_start ( |
1768 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 1768 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
1769 | RECLAIM_TICKETS_TicketIter cb, | 1769 | RECLAIM_TICKETS_TicketIter cb, |
1770 | void *cb_cls) | 1770 | void *cb_cls) |
1771 | { | 1771 | { |