diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-10-15 09:09:23 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-10-15 12:11:22 +0200 |
commit | 5680378974db794d67b75473435a0651fad0cd24 (patch) | |
tree | 06e1426049f9604114f9328554dc324b422052f4 /src/reclaim | |
parent | 7b992510c25c0081c59c4b1f61fe42ff5dc7680d (diff) | |
download | gnunet-5680378974db794d67b75473435a0651fad0cd24.tar.gz gnunet-5680378974db794d67b75473435a0651fad0cd24.zip |
- towards fix reclaim
Diffstat (limited to 'src/reclaim')
-rw-r--r-- | src/reclaim/gnunet-reclaim.c | 14 | ||||
-rw-r--r-- | src/reclaim/gnunet-service-reclaim.c | 26 | ||||
-rw-r--r-- | src/reclaim/gnunet-service-reclaim_tickets.c | 36 | ||||
-rw-r--r-- | src/reclaim/gnunet-service-reclaim_tickets.h | 12 | ||||
-rw-r--r-- | src/reclaim/oidc_helper.c | 22 | ||||
-rw-r--r-- | src/reclaim/oidc_helper.h | 10 | ||||
-rw-r--r-- | src/reclaim/plugin_rest_openid_connect.c | 57 | ||||
-rw-r--r-- | src/reclaim/plugin_rest_reclaim.c | 44 | ||||
-rw-r--r-- | src/reclaim/reclaim.h | 26 | ||||
-rw-r--r-- | src/reclaim/reclaim_api.c | 30 | ||||
-rw-r--r-- | src/reclaim/test_reclaim_attribute.c | 2 |
11 files changed, 136 insertions, 143 deletions
diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c index b9306b802..cefb66b8f 100644 --- a/src/reclaim/gnunet-reclaim.c +++ b/src/reclaim/gnunet-reclaim.c | |||
@@ -152,12 +152,12 @@ static struct GNUNET_RECLAIM_TicketIterator *ticket_iterator; | |||
152 | /** | 152 | /** |
153 | * ego private key | 153 | * ego private key |
154 | */ | 154 | */ |
155 | static const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey; | 155 | static const struct GNUNET_IDENTITY_PrivateKey *pkey; |
156 | 156 | ||
157 | /** | 157 | /** |
158 | * rp public key | 158 | * rp public key |
159 | */ | 159 | */ |
160 | static struct GNUNET_CRYPTO_EcdsaPublicKey rp_key; | 160 | static struct GNUNET_IDENTITY_PublicKey rp_key; |
161 | 161 | ||
162 | /** | 162 | /** |
163 | * Ticket to consume | 163 | * Ticket to consume |
@@ -261,7 +261,7 @@ store_cont (void *cls, int32_t success, const char *emsg) | |||
261 | 261 | ||
262 | static void | 262 | static void |
263 | process_attrs (void *cls, | 263 | process_attrs (void *cls, |
264 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 264 | const struct GNUNET_IDENTITY_PublicKey *identity, |
265 | const struct GNUNET_RECLAIM_Attribute *attr, | 265 | const struct GNUNET_RECLAIM_Attribute *attr, |
266 | const struct GNUNET_RECLAIM_Presentation *presentation) | 266 | const struct GNUNET_RECLAIM_Presentation *presentation) |
267 | { | 267 | { |
@@ -346,7 +346,7 @@ ticket_iter (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket) | |||
346 | aud = | 346 | aud = |
347 | GNUNET_STRINGS_data_to_string_alloc (&ticket->audience, | 347 | GNUNET_STRINGS_data_to_string_alloc (&ticket->audience, |
348 | sizeof(struct | 348 | sizeof(struct |
349 | GNUNET_CRYPTO_EcdsaPublicKey)); | 349 | GNUNET_IDENTITY_PublicKey)); |
350 | ref = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd, sizeof(ticket->rnd)); | 350 | ref = GNUNET_STRINGS_data_to_string_alloc (&ticket->rnd, sizeof(ticket->rnd)); |
351 | tkt = | 351 | tkt = |
352 | GNUNET_STRINGS_data_to_string_alloc (ticket, | 352 | GNUNET_STRINGS_data_to_string_alloc (ticket, |
@@ -511,7 +511,7 @@ iter_finished (void *cls) | |||
511 | 511 | ||
512 | static void | 512 | static void |
513 | iter_cb (void *cls, | 513 | iter_cb (void *cls, |
514 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 514 | const struct GNUNET_IDENTITY_PublicKey *identity, |
515 | const struct GNUNET_RECLAIM_Attribute *attr) | 515 | const struct GNUNET_RECLAIM_Attribute *attr) |
516 | { | 516 | { |
517 | struct GNUNET_RECLAIM_AttributeListEntry *le; | 517 | struct GNUNET_RECLAIM_AttributeListEntry *le; |
@@ -653,7 +653,7 @@ cred_iter_finished (void *cls) | |||
653 | 653 | ||
654 | static void | 654 | static void |
655 | cred_iter_cb (void *cls, | 655 | cred_iter_cb (void *cls, |
656 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 656 | const struct GNUNET_IDENTITY_PublicKey *identity, |
657 | const struct GNUNET_RECLAIM_Credential *cred) | 657 | const struct GNUNET_RECLAIM_Credential *cred) |
658 | { | 658 | { |
659 | char *cred_str; | 659 | char *cred_str; |
@@ -734,7 +734,7 @@ start_process () | |||
734 | 734 | ||
735 | if ((NULL != rp) && | 735 | if ((NULL != rp) && |
736 | (GNUNET_OK != | 736 | (GNUNET_OK != |
737 | GNUNET_CRYPTO_ecdsa_public_key_from_string (rp, strlen (rp), &rp_key)) ) | 737 | GNUNET_IDENTITY_public_key_from_string (rp, &rp_key)) ) |
738 | { | 738 | { |
739 | fprintf (stderr, "%s is not a public key!\n", rp); | 739 | fprintf (stderr, "%s is not a public key!\n", rp); |
740 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); | 740 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); |
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c index d2cdc62a2..0774fecea 100644 --- a/src/reclaim/gnunet-service-reclaim.c +++ b/src/reclaim/gnunet-service-reclaim.c | |||
@@ -110,7 +110,7 @@ struct Iterator | |||
110 | /** | 110 | /** |
111 | * Key of the zone we are iterating over. | 111 | * Key of the zone we are iterating over. |
112 | */ | 112 | */ |
113 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 113 | struct GNUNET_IDENTITY_PrivateKey identity; |
114 | 114 | ||
115 | /** | 115 | /** |
116 | * Namestore iterator | 116 | * Namestore iterator |
@@ -266,7 +266,7 @@ struct AttributeDeleteHandle | |||
266 | /** | 266 | /** |
267 | * Identity | 267 | * Identity |
268 | */ | 268 | */ |
269 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 269 | struct GNUNET_IDENTITY_PrivateKey identity; |
270 | 270 | ||
271 | 271 | ||
272 | /** | 272 | /** |
@@ -334,12 +334,12 @@ struct AttributeStoreHandle | |||
334 | /** | 334 | /** |
335 | * Identity | 335 | * Identity |
336 | */ | 336 | */ |
337 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 337 | struct GNUNET_IDENTITY_PrivateKey identity; |
338 | 338 | ||
339 | /** | 339 | /** |
340 | * Identity pubkey | 340 | * Identity pubkey |
341 | */ | 341 | */ |
342 | struct GNUNET_CRYPTO_EcdsaPublicKey identity_pkey; | 342 | struct GNUNET_IDENTITY_PublicKey identity_pkey; |
343 | 343 | ||
344 | /** | 344 | /** |
345 | * QueueEntry | 345 | * QueueEntry |
@@ -862,7 +862,7 @@ handle_revoke_ticket_message (void *cls, const struct RevokeTicketMessage *rm) | |||
862 | */ | 862 | */ |
863 | static void | 863 | static void |
864 | consume_result_cb (void *cls, | 864 | consume_result_cb (void *cls, |
865 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 865 | const struct GNUNET_IDENTITY_PublicKey *identity, |
866 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 866 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
867 | const struct GNUNET_RECLAIM_PresentationList *presentations, | 867 | const struct GNUNET_RECLAIM_PresentationList *presentations, |
868 | int32_t success, | 868 | int32_t success, |
@@ -1082,7 +1082,7 @@ handle_attribute_store_message (void *cls, | |||
1082 | ash->r_id = ntohl (sam->id); | 1082 | ash->r_id = ntohl (sam->id); |
1083 | ash->identity = sam->identity; | 1083 | ash->identity = sam->identity; |
1084 | ash->exp.rel_value_us = GNUNET_ntohll (sam->exp); | 1084 | ash->exp.rel_value_us = GNUNET_ntohll (sam->exp); |
1085 | GNUNET_CRYPTO_ecdsa_key_get_public (&sam->identity, &ash->identity_pkey); | 1085 | GNUNET_IDENTITY_key_get_public (&sam->identity, &ash->identity_pkey); |
1086 | 1086 | ||
1087 | GNUNET_SERVICE_client_continue (idp->client); | 1087 | GNUNET_SERVICE_client_continue (idp->client); |
1088 | ash->client = idp; | 1088 | ash->client = idp; |
@@ -1157,7 +1157,7 @@ cred_error (void *cls) | |||
1157 | */ | 1157 | */ |
1158 | static void | 1158 | static void |
1159 | cred_add_cb (void *cls, | 1159 | cred_add_cb (void *cls, |
1160 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 1160 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
1161 | const char *label, | 1161 | const char *label, |
1162 | unsigned int rd_count, | 1162 | unsigned int rd_count, |
1163 | const struct GNUNET_GNSRECORD_Data *rd) | 1163 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -1266,7 +1266,7 @@ handle_credential_store_message (void *cls, | |||
1266 | ash->r_id = ntohl (sam->id); | 1266 | ash->r_id = ntohl (sam->id); |
1267 | ash->identity = sam->identity; | 1267 | ash->identity = sam->identity; |
1268 | ash->exp.rel_value_us = GNUNET_ntohll (sam->exp); | 1268 | ash->exp.rel_value_us = GNUNET_ntohll (sam->exp); |
1269 | GNUNET_CRYPTO_ecdsa_key_get_public (&sam->identity, &ash->identity_pkey); | 1269 | GNUNET_IDENTITY_key_get_public (&sam->identity, &ash->identity_pkey); |
1270 | 1270 | ||
1271 | GNUNET_SERVICE_client_continue (idp->client); | 1271 | GNUNET_SERVICE_client_continue (idp->client); |
1272 | ash->client = idp; | 1272 | ash->client = idp; |
@@ -1311,7 +1311,7 @@ send_delete_response (struct AttributeDeleteHandle *adh, int32_t success) | |||
1311 | */ | 1311 | */ |
1312 | static void | 1312 | static void |
1313 | ticket_iter (void *cls, | 1313 | ticket_iter (void *cls, |
1314 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 1314 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
1315 | const char *label, | 1315 | const char *label, |
1316 | unsigned int rd_count, | 1316 | unsigned int rd_count, |
1317 | const struct GNUNET_GNSRECORD_Data *rd) | 1317 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -1739,7 +1739,7 @@ attr_iter_error (void *cls) | |||
1739 | */ | 1739 | */ |
1740 | static void | 1740 | static void |
1741 | attr_iter_cb (void *cls, | 1741 | attr_iter_cb (void *cls, |
1742 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 1742 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
1743 | const char *label, | 1743 | const char *label, |
1744 | unsigned int rd_count, | 1744 | unsigned int rd_count, |
1745 | const struct GNUNET_GNSRECORD_Data *rd) | 1745 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -1764,7 +1764,7 @@ attr_iter_cb (void *cls, | |||
1764 | GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT); | 1764 | GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT); |
1765 | arm->id = htonl (ai->request_id); | 1765 | arm->id = htonl (ai->request_id); |
1766 | arm->attr_len = htons (rd->data_size); | 1766 | arm->attr_len = htons (rd->data_size); |
1767 | GNUNET_CRYPTO_ecdsa_key_get_public (zone, &arm->identity); | 1767 | GNUNET_IDENTITY_key_get_public (zone, &arm->identity); |
1768 | data_tmp = (char *) &arm[1]; | 1768 | data_tmp = (char *) &arm[1]; |
1769 | GNUNET_memcpy (data_tmp, rd->data, rd->data_size); | 1769 | GNUNET_memcpy (data_tmp, rd->data, rd->data_size); |
1770 | GNUNET_MQ_send (ai->client->mq, env); | 1770 | GNUNET_MQ_send (ai->client->mq, env); |
@@ -1923,7 +1923,7 @@ cred_iter_error (void *cls) | |||
1923 | */ | 1923 | */ |
1924 | static void | 1924 | static void |
1925 | cred_iter_cb (void *cls, | 1925 | cred_iter_cb (void *cls, |
1926 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 1926 | const struct GNUNET_IDENTITY_PrivateKey *zone, |
1927 | const char *label, | 1927 | const char *label, |
1928 | unsigned int rd_count, | 1928 | unsigned int rd_count, |
1929 | const struct GNUNET_GNSRECORD_Data *rd) | 1929 | const struct GNUNET_GNSRECORD_Data *rd) |
@@ -1948,7 +1948,7 @@ cred_iter_cb (void *cls, | |||
1948 | GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_RESULT); | 1948 | GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_RESULT); |
1949 | arm->id = htonl (ai->request_id); | 1949 | arm->id = htonl (ai->request_id); |
1950 | arm->credential_len = htons (rd->data_size); | 1950 | arm->credential_len = htons (rd->data_size); |
1951 | GNUNET_CRYPTO_ecdsa_key_get_public (zone, &arm->identity); | 1951 | GNUNET_IDENTITY_key_get_public (zone, &arm->identity); |
1952 | data_tmp = (char *) &arm[1]; | 1952 | data_tmp = (char *) &arm[1]; |
1953 | GNUNET_memcpy (data_tmp, rd->data, rd->data_size); | 1953 | GNUNET_memcpy (data_tmp, rd->data, rd->data_size); |
1954 | 1954 | ||
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 | { |
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.h b/src/reclaim/gnunet-service-reclaim_tickets.h index 0dd790fc7..9c31a6143 100644 --- a/src/reclaim/gnunet-service-reclaim_tickets.h +++ b/src/reclaim/gnunet-service-reclaim_tickets.h | |||
@@ -138,7 +138,7 @@ typedef void (*RECLAIM_TICKETS_TicketResult) ( | |||
138 | */ | 138 | */ |
139 | typedef void (*RECLAIM_TICKETS_ConsumeCallback) ( | 139 | typedef void (*RECLAIM_TICKETS_ConsumeCallback) ( |
140 | void *cls, | 140 | void *cls, |
141 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 141 | const struct GNUNET_IDENTITY_PublicKey *identity, |
142 | const struct GNUNET_RECLAIM_AttributeList *attributes, | 142 | const struct GNUNET_RECLAIM_AttributeList *attributes, |
143 | const struct GNUNET_RECLAIM_PresentationList *presentations, | 143 | const struct GNUNET_RECLAIM_PresentationList *presentations, |
144 | int32_t success, | 144 | int32_t success, |
@@ -167,7 +167,7 @@ typedef void (*RECLAIM_TICKETS_RevokeCallback) (void *cls, int32_t success); | |||
167 | */ | 167 | */ |
168 | struct RECLAIM_TICKETS_RevokeHandle * | 168 | struct RECLAIM_TICKETS_RevokeHandle * |
169 | RECLAIM_TICKETS_revoke (const struct GNUNET_RECLAIM_Ticket *ticket, | 169 | RECLAIM_TICKETS_revoke (const struct GNUNET_RECLAIM_Ticket *ticket, |
170 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 170 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
171 | RECLAIM_TICKETS_RevokeCallback cb, | 171 | RECLAIM_TICKETS_RevokeCallback cb, |
172 | void *cb_cls); | 172 | void *cb_cls); |
173 | 173 | ||
@@ -193,7 +193,7 @@ RECLAIM_TICKETS_revoke_cancel (struct RECLAIM_TICKETS_RevokeHandle *rh); | |||
193 | * @return handle to the operation | 193 | * @return handle to the operation |
194 | */ | 194 | */ |
195 | struct RECLAIM_TICKETS_ConsumeHandle * | 195 | struct RECLAIM_TICKETS_ConsumeHandle * |
196 | RECLAIM_TICKETS_consume (const struct GNUNET_CRYPTO_EcdsaPrivateKey *id, | 196 | RECLAIM_TICKETS_consume (const struct GNUNET_IDENTITY_PrivateKey *id, |
197 | const struct GNUNET_RECLAIM_Ticket *ticket, | 197 | const struct GNUNET_RECLAIM_Ticket *ticket, |
198 | RECLAIM_TICKETS_ConsumeCallback cb, | 198 | RECLAIM_TICKETS_ConsumeCallback cb, |
199 | void *cb_cls); | 199 | void *cb_cls); |
@@ -220,9 +220,9 @@ RECLAIM_TICKETS_consume_cancel (struct RECLAIM_TICKETS_ConsumeHandle *cth); | |||
220 | * FIXME: Return handle?? | 220 | * FIXME: Return handle?? |
221 | */ | 221 | */ |
222 | void | 222 | void |
223 | RECLAIM_TICKETS_issue (const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 223 | RECLAIM_TICKETS_issue (const struct GNUNET_IDENTITY_PrivateKey *identity, |
224 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 224 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
225 | const struct GNUNET_CRYPTO_EcdsaPublicKey *audience, | 225 | const struct GNUNET_IDENTITY_PublicKey *audience, |
226 | RECLAIM_TICKETS_TicketResult cb, | 226 | RECLAIM_TICKETS_TicketResult cb, |
227 | void *cb_cls); | 227 | void *cb_cls); |
228 | 228 | ||
@@ -255,7 +255,7 @@ RECLAIM_TICKETS_iteration_stop (struct RECLAIM_TICKETS_Iterator *iter); | |||
255 | */ | 255 | */ |
256 | struct RECLAIM_TICKETS_Iterator * | 256 | struct RECLAIM_TICKETS_Iterator * |
257 | RECLAIM_TICKETS_iteration_start ( | 257 | RECLAIM_TICKETS_iteration_start ( |
258 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 258 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
259 | RECLAIM_TICKETS_TicketIter cb, | 259 | RECLAIM_TICKETS_TicketIter cb, |
260 | void *cb_cls); | 260 | void *cb_cls); |
261 | 261 | ||
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c index b307a358c..c3ff07976 100644 --- a/src/reclaim/oidc_helper.c +++ b/src/reclaim/oidc_helper.c | |||
@@ -155,7 +155,7 @@ fix_base64 (char *str) | |||
155 | } | 155 | } |
156 | 156 | ||
157 | static json_t* | 157 | static json_t* |
158 | generate_userinfo_json(const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, | 158 | generate_userinfo_json(const struct GNUNET_IDENTITY_PublicKey *sub_key, |
159 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 159 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
160 | const struct GNUNET_RECLAIM_PresentationList *presentations) | 160 | const struct GNUNET_RECLAIM_PresentationList *presentations) |
161 | { | 161 | { |
@@ -180,7 +180,7 @@ generate_userinfo_json(const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, | |||
180 | subject = | 180 | subject = |
181 | GNUNET_STRINGS_data_to_string_alloc (sub_key, | 181 | GNUNET_STRINGS_data_to_string_alloc (sub_key, |
182 | sizeof(struct | 182 | sizeof(struct |
183 | GNUNET_CRYPTO_EcdsaPublicKey)); | 183 | GNUNET_IDENTITY_PublicKey)); |
184 | body = json_object (); | 184 | body = json_object (); |
185 | aggr_names = json_object (); | 185 | aggr_names = json_object (); |
186 | aggr_sources = json_object (); | 186 | aggr_sources = json_object (); |
@@ -295,7 +295,7 @@ generate_userinfo_json(const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, | |||
295 | * @return Userinfo JSON | 295 | * @return Userinfo JSON |
296 | */ | 296 | */ |
297 | char * | 297 | char * |
298 | OIDC_generate_userinfo (const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, | 298 | OIDC_generate_userinfo (const struct GNUNET_IDENTITY_PublicKey *sub_key, |
299 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 299 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
300 | const struct GNUNET_RECLAIM_PresentationList *presentations) | 300 | const struct GNUNET_RECLAIM_PresentationList *presentations) |
301 | { | 301 | { |
@@ -321,8 +321,8 @@ OIDC_generate_userinfo (const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, | |||
321 | * @return a new base64-encoded JWT string. | 321 | * @return a new base64-encoded JWT string. |
322 | */ | 322 | */ |
323 | char * | 323 | char * |
324 | OIDC_generate_id_token (const struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key, | 324 | OIDC_generate_id_token (const struct GNUNET_IDENTITY_PublicKey *aud_key, |
325 | const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, | 325 | const struct GNUNET_IDENTITY_PublicKey *sub_key, |
326 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 326 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
327 | const struct GNUNET_RECLAIM_PresentationList *presentations, | 327 | const struct GNUNET_RECLAIM_PresentationList *presentations, |
328 | const struct GNUNET_TIME_Relative *expiration_time, | 328 | const struct GNUNET_TIME_Relative *expiration_time, |
@@ -356,11 +356,11 @@ OIDC_generate_id_token (const struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key, | |||
356 | subject = | 356 | subject = |
357 | GNUNET_STRINGS_data_to_string_alloc (sub_key, | 357 | GNUNET_STRINGS_data_to_string_alloc (sub_key, |
358 | sizeof(struct | 358 | sizeof(struct |
359 | GNUNET_CRYPTO_EcdsaPublicKey)); | 359 | GNUNET_IDENTITY_PublicKey)); |
360 | audience = | 360 | audience = |
361 | GNUNET_STRINGS_data_to_string_alloc (aud_key, | 361 | GNUNET_STRINGS_data_to_string_alloc (aud_key, |
362 | sizeof(struct | 362 | sizeof(struct |
363 | GNUNET_CRYPTO_EcdsaPublicKey)); | 363 | GNUNET_IDENTITY_PublicKey)); |
364 | header = create_jwt_header (); | 364 | header = create_jwt_header (); |
365 | 365 | ||
366 | // aud REQUIRED public key client_id must be there | 366 | // aud REQUIRED public key client_id must be there |
@@ -438,7 +438,7 @@ OIDC_generate_id_token (const struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key, | |||
438 | * @return a new authorization code (caller must free) | 438 | * @return a new authorization code (caller must free) |
439 | */ | 439 | */ |
440 | char * | 440 | char * |
441 | OIDC_build_authz_code (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, | 441 | OIDC_build_authz_code (const struct GNUNET_IDENTITY_PrivateKey *issuer, |
442 | const struct GNUNET_RECLAIM_Ticket *ticket, | 442 | const struct GNUNET_RECLAIM_Ticket *ticket, |
443 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 443 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
444 | const struct GNUNET_RECLAIM_PresentationList *presentations, | 444 | const struct GNUNET_RECLAIM_PresentationList *presentations, |
@@ -544,7 +544,7 @@ OIDC_build_authz_code (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, | |||
544 | buf_ptr += payload_len; | 544 | buf_ptr += payload_len; |
545 | // Sign and store signature | 545 | // Sign and store signature |
546 | if (GNUNET_SYSERR == | 546 | if (GNUNET_SYSERR == |
547 | GNUNET_CRYPTO_ecdsa_sign_ (issuer, | 547 | GNUNET_CRYPTO_ecdsa_sign_ (&issuer->ecdsa_key, |
548 | purpose, | 548 | purpose, |
549 | (struct GNUNET_CRYPTO_EcdsaSignature *) | 549 | (struct GNUNET_CRYPTO_EcdsaSignature *) |
550 | buf_ptr)) | 550 | buf_ptr)) |
@@ -576,7 +576,7 @@ OIDC_build_authz_code (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, | |||
576 | * @return GNUNET_OK if successful, else GNUNET_SYSERR | 576 | * @return GNUNET_OK if successful, else GNUNET_SYSERR |
577 | */ | 577 | */ |
578 | int | 578 | int |
579 | OIDC_parse_authz_code (const struct GNUNET_CRYPTO_EcdsaPublicKey *audience, | 579 | OIDC_parse_authz_code (const struct GNUNET_IDENTITY_PublicKey *audience, |
580 | const char *code, | 580 | const char *code, |
581 | const char *code_verifier, | 581 | const char *code_verifier, |
582 | struct GNUNET_RECLAIM_Ticket *ticket, | 582 | struct GNUNET_RECLAIM_Ticket *ticket, |
@@ -687,7 +687,7 @@ OIDC_parse_authz_code (const struct GNUNET_CRYPTO_EcdsaPublicKey *audience, | |||
687 | GNUNET_CRYPTO_ecdsa_verify_ (GNUNET_SIGNATURE_PURPOSE_RECLAIM_CODE_SIGN, | 687 | GNUNET_CRYPTO_ecdsa_verify_ (GNUNET_SIGNATURE_PURPOSE_RECLAIM_CODE_SIGN, |
688 | purpose, | 688 | purpose, |
689 | signature, | 689 | signature, |
690 | &ticket->identity)) | 690 | &ticket->identity.ecdsa_key)) |
691 | { | 691 | { |
692 | GNUNET_free (code_payload); | 692 | GNUNET_free (code_payload); |
693 | if (NULL != *nonce_str) | 693 | if (NULL != *nonce_str) |
diff --git a/src/reclaim/oidc_helper.h b/src/reclaim/oidc_helper.h index 10a6f3d1f..eb1022423 100644 --- a/src/reclaim/oidc_helper.h +++ b/src/reclaim/oidc_helper.h | |||
@@ -50,8 +50,8 @@ | |||
50 | * @return a new base64-encoded JWT string. | 50 | * @return a new base64-encoded JWT string. |
51 | */ | 51 | */ |
52 | char* | 52 | char* |
53 | OIDC_generate_id_token (const struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key, | 53 | OIDC_generate_id_token (const struct GNUNET_IDENTITY_PublicKey *aud_key, |
54 | const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, | 54 | const struct GNUNET_IDENTITY_PublicKey *sub_key, |
55 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 55 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
56 | const struct GNUNET_RECLAIM_PresentationList *presentations, | 56 | const struct GNUNET_RECLAIM_PresentationList *presentations, |
57 | const struct GNUNET_TIME_Relative *expiration_time, | 57 | const struct GNUNET_TIME_Relative *expiration_time, |
@@ -71,7 +71,7 @@ OIDC_generate_id_token (const struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key, | |||
71 | * @return a new authorization code (caller must free) | 71 | * @return a new authorization code (caller must free) |
72 | */ | 72 | */ |
73 | char* | 73 | char* |
74 | OIDC_build_authz_code (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, | 74 | OIDC_build_authz_code (const struct GNUNET_IDENTITY_PrivateKey *issuer, |
75 | const struct GNUNET_RECLAIM_Ticket *ticket, | 75 | const struct GNUNET_RECLAIM_Ticket *ticket, |
76 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 76 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
77 | const struct GNUNET_RECLAIM_PresentationList *presentations, | 77 | const struct GNUNET_RECLAIM_PresentationList *presentations, |
@@ -93,7 +93,7 @@ OIDC_build_authz_code (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, | |||
93 | * @return GNUNET_OK if successful, else GNUNET_SYSERR | 93 | * @return GNUNET_OK if successful, else GNUNET_SYSERR |
94 | */ | 94 | */ |
95 | int | 95 | int |
96 | OIDC_parse_authz_code (const struct GNUNET_CRYPTO_EcdsaPublicKey *ecdsa_pub, | 96 | OIDC_parse_authz_code (const struct GNUNET_IDENTITY_PublicKey *ecdsa_pub, |
97 | const char *code, | 97 | const char *code, |
98 | const char *code_verifier, | 98 | const char *code_verifier, |
99 | struct GNUNET_RECLAIM_Ticket *ticket, | 99 | struct GNUNET_RECLAIM_Ticket *ticket, |
@@ -152,7 +152,7 @@ OIDC_check_scopes_for_claim_request (const char *scopes, | |||
152 | * @return Userinfo JSON | 152 | * @return Userinfo JSON |
153 | */ | 153 | */ |
154 | char * | 154 | char * |
155 | OIDC_generate_userinfo (const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, | 155 | OIDC_generate_userinfo (const struct GNUNET_IDENTITY_PublicKey *sub_key, |
156 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 156 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
157 | const struct GNUNET_RECLAIM_PresentationList *presentations); | 157 | const struct GNUNET_RECLAIM_PresentationList *presentations); |
158 | 158 | ||
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c index 5b0bb2b6f..7a8a886bd 100644 --- a/src/reclaim/plugin_rest_openid_connect.c +++ b/src/reclaim/plugin_rest_openid_connect.c | |||
@@ -300,7 +300,7 @@ struct OIDC_Variables | |||
300 | /** | 300 | /** |
301 | * The RP client public key | 301 | * The RP client public key |
302 | */ | 302 | */ |
303 | struct GNUNET_CRYPTO_EcdsaPublicKey client_pkey; | 303 | struct GNUNET_IDENTITY_PublicKey client_pkey; |
304 | 304 | ||
305 | /** | 305 | /** |
306 | * The OIDC client id of the RP | 306 | * The OIDC client id of the RP |
@@ -411,7 +411,7 @@ struct RequestHandle | |||
411 | /** | 411 | /** |
412 | * Pointer to ego private key | 412 | * Pointer to ego private key |
413 | */ | 413 | */ |
414 | struct GNUNET_CRYPTO_EcdsaPrivateKey priv_key; | 414 | struct GNUNET_IDENTITY_PrivateKey priv_key; |
415 | 415 | ||
416 | /** | 416 | /** |
417 | * OIDC variables | 417 | * OIDC variables |
@@ -972,7 +972,7 @@ oidc_ticket_issue_cb (void *cls, | |||
972 | (NULL != handle->tld)) | 972 | (NULL != handle->tld)) |
973 | { | 973 | { |
974 | GNUNET_asprintf (&redirect_uri, | 974 | GNUNET_asprintf (&redirect_uri, |
975 | "%s.%s/%s?%s=%s&state=%s", | 975 | "%s.%s/%s%s%s=%s&state=%s", |
976 | handle->redirect_prefix, | 976 | handle->redirect_prefix, |
977 | handle->tld, | 977 | handle->tld, |
978 | handle->redirect_suffix, | 978 | handle->redirect_suffix, |
@@ -1087,7 +1087,7 @@ oidc_cred_collect_finished_cb (void *cls) | |||
1087 | */ | 1087 | */ |
1088 | static void | 1088 | static void |
1089 | oidc_cred_collect (void *cls, | 1089 | oidc_cred_collect (void *cls, |
1090 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 1090 | const struct GNUNET_IDENTITY_PublicKey *identity, |
1091 | const struct GNUNET_RECLAIM_Credential *cred) | 1091 | const struct GNUNET_RECLAIM_Credential *cred) |
1092 | { | 1092 | { |
1093 | struct RequestHandle *handle = cls; | 1093 | struct RequestHandle *handle = cls; |
@@ -1211,7 +1211,7 @@ attr_in_userinfo_request (struct RequestHandle *handle, | |||
1211 | */ | 1211 | */ |
1212 | static void | 1212 | static void |
1213 | oidc_attr_collect (void *cls, | 1213 | oidc_attr_collect (void *cls, |
1214 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 1214 | const struct GNUNET_IDENTITY_PublicKey *identity, |
1215 | const struct GNUNET_RECLAIM_Attribute *attr) | 1215 | const struct GNUNET_RECLAIM_Attribute *attr) |
1216 | { | 1216 | { |
1217 | struct RequestHandle *handle = cls; | 1217 | struct RequestHandle *handle = cls; |
@@ -1260,8 +1260,8 @@ code_redirect (void *cls) | |||
1260 | struct RequestHandle *handle = cls; | 1260 | struct RequestHandle *handle = cls; |
1261 | struct GNUNET_TIME_Absolute current_time; | 1261 | struct GNUNET_TIME_Absolute current_time; |
1262 | struct GNUNET_TIME_Absolute *relog_time; | 1262 | struct GNUNET_TIME_Absolute *relog_time; |
1263 | struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; | 1263 | struct GNUNET_IDENTITY_PublicKey pubkey; |
1264 | struct GNUNET_CRYPTO_EcdsaPublicKey ego_pkey; | 1264 | struct GNUNET_IDENTITY_PublicKey ego_pkey; |
1265 | struct GNUNET_HashCode cache_key; | 1265 | struct GNUNET_HashCode cache_key; |
1266 | char *identity_cookie; | 1266 | char *identity_cookie; |
1267 | 1267 | ||
@@ -1281,11 +1281,8 @@ code_redirect (void *cls) | |||
1281 | if (current_time.abs_value_us <= relog_time->abs_value_us) | 1281 | if (current_time.abs_value_us <= relog_time->abs_value_us) |
1282 | { | 1282 | { |
1283 | if (GNUNET_OK != | 1283 | if (GNUNET_OK != |
1284 | GNUNET_CRYPTO_ecdsa_public_key_from_string (handle->oidc | 1284 | GNUNET_IDENTITY_public_key_from_string (handle->oidc |
1285 | ->login_identity, | 1285 | ->login_identity, |
1286 | strlen ( | ||
1287 | handle->oidc | ||
1288 | ->login_identity), | ||
1289 | &pubkey)) | 1286 | &pubkey)) |
1290 | { | 1287 | { |
1291 | handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_COOKIE); | 1288 | handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_COOKIE); |
@@ -1376,7 +1373,7 @@ lookup_redirect_uri_result (void *cls, | |||
1376 | char *tmp; | 1373 | char *tmp; |
1377 | char *tmp_key_str; | 1374 | char *tmp_key_str; |
1378 | char *pos; | 1375 | char *pos; |
1379 | struct GNUNET_CRYPTO_EcdsaPublicKey redirect_zone; | 1376 | struct GNUNET_IDENTITY_PublicKey redirect_zone; |
1380 | 1377 | ||
1381 | handle->gns_op = NULL; | 1378 | handle->gns_op = NULL; |
1382 | if (0 == rd_count) | 1379 | if (0 == rd_count) |
@@ -1608,10 +1605,10 @@ static void | |||
1608 | tld_iter (void *cls, const char *section, const char *option, const char *value) | 1605 | tld_iter (void *cls, const char *section, const char *option, const char *value) |
1609 | { | 1606 | { |
1610 | struct RequestHandle *handle = cls; | 1607 | struct RequestHandle *handle = cls; |
1611 | struct GNUNET_CRYPTO_EcdsaPublicKey pkey; | 1608 | struct GNUNET_IDENTITY_PublicKey pkey; |
1612 | 1609 | ||
1613 | if (GNUNET_OK != | 1610 | if (GNUNET_OK != |
1614 | GNUNET_CRYPTO_ecdsa_public_key_from_string (value, strlen (value), &pkey)) | 1611 | GNUNET_IDENTITY_public_key_from_string (value, &pkey)) |
1615 | { | 1612 | { |
1616 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Skipping non key %s\n", value); | 1613 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Skipping non key %s\n", value); |
1617 | return; | 1614 | return; |
@@ -1635,8 +1632,8 @@ authorize_endpoint (struct GNUNET_REST_RequestHandle *con_handle, | |||
1635 | { | 1632 | { |
1636 | struct RequestHandle *handle = cls; | 1633 | struct RequestHandle *handle = cls; |
1637 | struct EgoEntry *tmp_ego; | 1634 | struct EgoEntry *tmp_ego; |
1638 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key; | 1635 | const struct GNUNET_IDENTITY_PrivateKey *priv_key; |
1639 | struct GNUNET_CRYPTO_EcdsaPublicKey pkey; | 1636 | struct GNUNET_IDENTITY_PublicKey pkey; |
1640 | 1637 | ||
1641 | cookie_identity_interpretation (handle); | 1638 | cookie_identity_interpretation (handle); |
1642 | 1639 | ||
@@ -1664,9 +1661,7 @@ authorize_endpoint (struct GNUNET_REST_RequestHandle *con_handle, | |||
1664 | } | 1661 | } |
1665 | 1662 | ||
1666 | if (GNUNET_OK != | 1663 | if (GNUNET_OK != |
1667 | GNUNET_CRYPTO_ecdsa_public_key_from_string (handle->oidc->client_id, | 1664 | GNUNET_IDENTITY_public_key_from_string (handle->oidc->client_id, |
1668 | strlen ( | ||
1669 | handle->oidc->client_id), | ||
1670 | &handle->oidc->client_pkey)) | 1665 | &handle->oidc->client_pkey)) |
1671 | { | 1666 | { |
1672 | handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_UNAUTHORIZED_CLIENT); | 1667 | handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_UNAUTHORIZED_CLIENT); |
@@ -1682,7 +1677,7 @@ authorize_endpoint (struct GNUNET_REST_RequestHandle *con_handle, | |||
1682 | for (tmp_ego = ego_head; NULL != tmp_ego; tmp_ego = tmp_ego->next) | 1677 | for (tmp_ego = ego_head; NULL != tmp_ego; tmp_ego = tmp_ego->next) |
1683 | { | 1678 | { |
1684 | priv_key = GNUNET_IDENTITY_ego_get_private_key (tmp_ego->ego); | 1679 | priv_key = GNUNET_IDENTITY_ego_get_private_key (tmp_ego->ego); |
1685 | GNUNET_CRYPTO_ecdsa_key_get_public (priv_key, &pkey); | 1680 | GNUNET_IDENTITY_key_get_public (priv_key, &pkey); |
1686 | if (0 == GNUNET_memcmp (&pkey, &handle->oidc->client_pkey)) | 1681 | if (0 == GNUNET_memcmp (&pkey, &handle->oidc->client_pkey)) |
1687 | { | 1682 | { |
1688 | handle->tld = GNUNET_strdup (tmp_ego->identifier); | 1683 | handle->tld = GNUNET_strdup (tmp_ego->identifier); |
@@ -1865,7 +1860,7 @@ parse_credentials_post_body (struct RequestHandle *handle, | |||
1865 | 1860 | ||
1866 | static int | 1861 | static int |
1867 | check_authorization (struct RequestHandle *handle, | 1862 | check_authorization (struct RequestHandle *handle, |
1868 | struct GNUNET_CRYPTO_EcdsaPublicKey *cid) | 1863 | struct GNUNET_IDENTITY_PublicKey *cid) |
1869 | { | 1864 | { |
1870 | char *expected_pass; | 1865 | char *expected_pass; |
1871 | char *received_cid; | 1866 | char *received_cid; |
@@ -1902,7 +1897,7 @@ check_authorization (struct RequestHandle *handle, | |||
1902 | GNUNET_STRINGS_string_to_data (received_cid, | 1897 | GNUNET_STRINGS_string_to_data (received_cid, |
1903 | strlen (received_cid), | 1898 | strlen (received_cid), |
1904 | cid, | 1899 | cid, |
1905 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey)); | 1900 | sizeof(struct GNUNET_IDENTITY_PublicKey)); |
1906 | GNUNET_free (received_cid); | 1901 | GNUNET_free (received_cid); |
1907 | return GNUNET_OK; | 1902 | return GNUNET_OK; |
1908 | 1903 | ||
@@ -1948,7 +1943,7 @@ check_authorization (struct RequestHandle *handle, | |||
1948 | GNUNET_STRINGS_string_to_data (received_cid, | 1943 | GNUNET_STRINGS_string_to_data (received_cid, |
1949 | strlen (received_cid), | 1944 | strlen (received_cid), |
1950 | cid, | 1945 | cid, |
1951 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey)); | 1946 | sizeof(struct GNUNET_IDENTITY_PublicKey)); |
1952 | 1947 | ||
1953 | GNUNET_free (received_cpw); | 1948 | GNUNET_free (received_cpw); |
1954 | GNUNET_free (received_cid); | 1949 | GNUNET_free (received_cid); |
@@ -1958,10 +1953,10 @@ check_authorization (struct RequestHandle *handle, | |||
1958 | 1953 | ||
1959 | const struct EgoEntry * | 1954 | const struct EgoEntry * |
1960 | find_ego (struct RequestHandle *handle, | 1955 | find_ego (struct RequestHandle *handle, |
1961 | struct GNUNET_CRYPTO_EcdsaPublicKey *test_key) | 1956 | struct GNUNET_IDENTITY_PublicKey *test_key) |
1962 | { | 1957 | { |
1963 | struct EgoEntry *ego_entry; | 1958 | struct EgoEntry *ego_entry; |
1964 | struct GNUNET_CRYPTO_EcdsaPublicKey pub_key; | 1959 | struct GNUNET_IDENTITY_PublicKey pub_key; |
1965 | 1960 | ||
1966 | for (ego_entry = ego_head; NULL != ego_entry; | 1961 | for (ego_entry = ego_head; NULL != ego_entry; |
1967 | ego_entry = ego_entry->next) | 1962 | ego_entry = ego_entry->next) |
@@ -1992,7 +1987,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle, | |||
1992 | struct GNUNET_RECLAIM_AttributeList *cl = NULL; | 1987 | struct GNUNET_RECLAIM_AttributeList *cl = NULL; |
1993 | struct GNUNET_RECLAIM_PresentationList *pl = NULL; | 1988 | struct GNUNET_RECLAIM_PresentationList *pl = NULL; |
1994 | struct GNUNET_RECLAIM_Ticket ticket; | 1989 | struct GNUNET_RECLAIM_Ticket ticket; |
1995 | struct GNUNET_CRYPTO_EcdsaPublicKey cid; | 1990 | struct GNUNET_IDENTITY_PublicKey cid; |
1996 | struct GNUNET_HashCode cache_key; | 1991 | struct GNUNET_HashCode cache_key; |
1997 | struct MHD_Response *resp; | 1992 | struct MHD_Response *resp; |
1998 | char *grant_type; | 1993 | char *grant_type; |
@@ -2145,7 +2140,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle, | |||
2145 | */ | 2140 | */ |
2146 | static void | 2141 | static void |
2147 | consume_ticket (void *cls, | 2142 | consume_ticket (void *cls, |
2148 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 2143 | const struct GNUNET_IDENTITY_PublicKey *identity, |
2149 | const struct GNUNET_RECLAIM_Attribute *attr, | 2144 | const struct GNUNET_RECLAIM_Attribute *attr, |
2150 | const struct GNUNET_RECLAIM_Presentation *pres) | 2145 | const struct GNUNET_RECLAIM_Presentation *pres) |
2151 | { | 2146 | { |
@@ -2225,7 +2220,7 @@ userinfo_endpoint (struct GNUNET_REST_RequestHandle *con_handle, | |||
2225 | char *authorization_type; | 2220 | char *authorization_type; |
2226 | char *authorization_access_token; | 2221 | char *authorization_access_token; |
2227 | const struct EgoEntry *aud_ego; | 2222 | const struct EgoEntry *aud_ego; |
2228 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 2223 | const struct GNUNET_IDENTITY_PrivateKey *privkey; |
2229 | 2224 | ||
2230 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Getting userinfo\n"); | 2225 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Getting userinfo\n"); |
2231 | GNUNET_CRYPTO_hash (OIDC_AUTHORIZATION_HEADER_KEY, | 2226 | GNUNET_CRYPTO_hash (OIDC_AUTHORIZATION_HEADER_KEY, |
@@ -2349,7 +2344,7 @@ list_ego (void *cls, | |||
2349 | const char *identifier) | 2344 | const char *identifier) |
2350 | { | 2345 | { |
2351 | struct EgoEntry *ego_entry; | 2346 | struct EgoEntry *ego_entry; |
2352 | struct GNUNET_CRYPTO_EcdsaPublicKey pk; | 2347 | struct GNUNET_IDENTITY_PublicKey pk; |
2353 | 2348 | ||
2354 | if ((NULL == ego) && (ID_REST_STATE_INIT == state)) | 2349 | if ((NULL == ego) && (ID_REST_STATE_INIT == state)) |
2355 | { | 2350 | { |
@@ -2362,7 +2357,7 @@ list_ego (void *cls, | |||
2362 | { | 2357 | { |
2363 | ego_entry = GNUNET_new (struct EgoEntry); | 2358 | ego_entry = GNUNET_new (struct EgoEntry); |
2364 | GNUNET_IDENTITY_ego_get_public_key (ego, &pk); | 2359 | GNUNET_IDENTITY_ego_get_public_key (ego, &pk); |
2365 | ego_entry->keystring = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk); | 2360 | ego_entry->keystring = GNUNET_IDENTITY_public_key_to_string (&pk); |
2366 | ego_entry->ego = ego; | 2361 | ego_entry->ego = ego; |
2367 | ego_entry->identifier = GNUNET_strdup (identifier); | 2362 | ego_entry->identifier = GNUNET_strdup (identifier); |
2368 | GNUNET_CONTAINER_DLL_insert_tail (ego_head, | 2363 | GNUNET_CONTAINER_DLL_insert_tail (ego_head, |
@@ -2389,7 +2384,7 @@ list_ego (void *cls, | |||
2389 | /* Add */ | 2384 | /* Add */ |
2390 | ego_entry = GNUNET_new (struct EgoEntry); | 2385 | ego_entry = GNUNET_new (struct EgoEntry); |
2391 | GNUNET_IDENTITY_ego_get_public_key (ego, &pk); | 2386 | GNUNET_IDENTITY_ego_get_public_key (ego, &pk); |
2392 | ego_entry->keystring = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk); | 2387 | ego_entry->keystring = GNUNET_IDENTITY_public_key_to_string (&pk); |
2393 | ego_entry->ego = ego; | 2388 | ego_entry->ego = ego; |
2394 | ego_entry->identifier = GNUNET_strdup (identifier); | 2389 | ego_entry->identifier = GNUNET_strdup (identifier); |
2395 | GNUNET_CONTAINER_DLL_insert_tail (ego_head, | 2390 | GNUNET_CONTAINER_DLL_insert_tail (ego_head, |
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c index ff11d2a56..022744c82 100644 --- a/src/reclaim/plugin_rest_reclaim.c +++ b/src/reclaim/plugin_rest_reclaim.c | |||
@@ -172,7 +172,7 @@ struct RequestHandle | |||
172 | /** | 172 | /** |
173 | * Pointer to ego private key | 173 | * Pointer to ego private key |
174 | */ | 174 | */ |
175 | struct GNUNET_CRYPTO_EcdsaPrivateKey priv_key; | 175 | struct GNUNET_IDENTITY_PrivateKey priv_key; |
176 | 176 | ||
177 | /** | 177 | /** |
178 | * Rest connection | 178 | * Rest connection |
@@ -440,14 +440,14 @@ ticket_collect (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket) | |||
440 | tmp = | 440 | tmp = |
441 | GNUNET_STRINGS_data_to_string_alloc (&ticket->identity, | 441 | GNUNET_STRINGS_data_to_string_alloc (&ticket->identity, |
442 | sizeof(struct | 442 | sizeof(struct |
443 | GNUNET_CRYPTO_EcdsaPublicKey)); | 443 | GNUNET_IDENTITY_PublicKey)); |
444 | value = json_string (tmp); | 444 | value = json_string (tmp); |
445 | json_object_set_new (json_resource, "issuer", value); | 445 | json_object_set_new (json_resource, "issuer", value); |
446 | GNUNET_free (tmp); | 446 | GNUNET_free (tmp); |
447 | tmp = | 447 | tmp = |
448 | GNUNET_STRINGS_data_to_string_alloc (&ticket->audience, | 448 | GNUNET_STRINGS_data_to_string_alloc (&ticket->audience, |
449 | sizeof(struct | 449 | sizeof(struct |
450 | GNUNET_CRYPTO_EcdsaPublicKey)); | 450 | GNUNET_IDENTITY_PublicKey)); |
451 | value = json_string (tmp); | 451 | value = json_string (tmp); |
452 | json_object_set_new (json_resource, "audience", value); | 452 | json_object_set_new (json_resource, "audience", value); |
453 | GNUNET_free (tmp); | 453 | GNUNET_free (tmp); |
@@ -465,7 +465,7 @@ add_credential_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
465 | void *cls) | 465 | void *cls) |
466 | { | 466 | { |
467 | struct RequestHandle *handle = cls; | 467 | struct RequestHandle *handle = cls; |
468 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity_priv; | 468 | const struct GNUNET_IDENTITY_PrivateKey *identity_priv; |
469 | const char *identity; | 469 | const char *identity; |
470 | struct EgoEntry *ego_entry; | 470 | struct EgoEntry *ego_entry; |
471 | struct GNUNET_RECLAIM_Credential *attribute; | 471 | struct GNUNET_RECLAIM_Credential *attribute; |
@@ -545,7 +545,7 @@ add_credential_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
545 | */ | 545 | */ |
546 | static void | 546 | static void |
547 | cred_collect (void *cls, | 547 | cred_collect (void *cls, |
548 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 548 | const struct GNUNET_IDENTITY_PublicKey *identity, |
549 | const struct GNUNET_RECLAIM_Credential *cred) | 549 | const struct GNUNET_RECLAIM_Credential *cred) |
550 | { | 550 | { |
551 | struct RequestHandle *handle = cls; | 551 | struct RequestHandle *handle = cls; |
@@ -631,7 +631,7 @@ list_credential_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
631 | void *cls) | 631 | void *cls) |
632 | { | 632 | { |
633 | struct RequestHandle *handle = cls; | 633 | struct RequestHandle *handle = cls; |
634 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key; | 634 | const struct GNUNET_IDENTITY_PrivateKey *priv_key; |
635 | struct EgoEntry *ego_entry; | 635 | struct EgoEntry *ego_entry; |
636 | char *identity; | 636 | char *identity; |
637 | 637 | ||
@@ -688,7 +688,7 @@ delete_credential_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
688 | void *cls) | 688 | void *cls) |
689 | { | 689 | { |
690 | struct RequestHandle *handle = cls; | 690 | struct RequestHandle *handle = cls; |
691 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key; | 691 | const struct GNUNET_IDENTITY_PrivateKey *priv_key; |
692 | struct GNUNET_RECLAIM_Credential attr; | 692 | struct GNUNET_RECLAIM_Credential attr; |
693 | struct EgoEntry *ego_entry; | 693 | struct EgoEntry *ego_entry; |
694 | char *identity_id_str; | 694 | char *identity_id_str; |
@@ -754,7 +754,7 @@ list_tickets_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
754 | const char *url, | 754 | const char *url, |
755 | void *cls) | 755 | void *cls) |
756 | { | 756 | { |
757 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key; | 757 | const struct GNUNET_IDENTITY_PrivateKey *priv_key; |
758 | struct RequestHandle *handle = cls; | 758 | struct RequestHandle *handle = cls; |
759 | struct EgoEntry *ego_entry; | 759 | struct EgoEntry *ego_entry; |
760 | char *identity; | 760 | char *identity; |
@@ -801,7 +801,7 @@ add_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
801 | const char *url, | 801 | const char *url, |
802 | void *cls) | 802 | void *cls) |
803 | { | 803 | { |
804 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity_priv; | 804 | const struct GNUNET_IDENTITY_PrivateKey *identity_priv; |
805 | const char *identity; | 805 | const char *identity; |
806 | struct RequestHandle *handle = cls; | 806 | struct RequestHandle *handle = cls; |
807 | struct EgoEntry *ego_entry; | 807 | struct EgoEntry *ego_entry; |
@@ -949,7 +949,7 @@ parse_jwt (const struct GNUNET_RECLAIM_Credential *cred, | |||
949 | */ | 949 | */ |
950 | static void | 950 | static void |
951 | attr_collect (void *cls, | 951 | attr_collect (void *cls, |
952 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 952 | const struct GNUNET_IDENTITY_PublicKey *identity, |
953 | const struct GNUNET_RECLAIM_Attribute *attr) | 953 | const struct GNUNET_RECLAIM_Attribute *attr) |
954 | { | 954 | { |
955 | struct RequestHandle *handle = cls; | 955 | struct RequestHandle *handle = cls; |
@@ -996,7 +996,7 @@ list_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
996 | const char *url, | 996 | const char *url, |
997 | void *cls) | 997 | void *cls) |
998 | { | 998 | { |
999 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key; | 999 | const struct GNUNET_IDENTITY_PrivateKey *priv_key; |
1000 | struct RequestHandle *handle = cls; | 1000 | struct RequestHandle *handle = cls; |
1001 | struct EgoEntry *ego_entry; | 1001 | struct EgoEntry *ego_entry; |
1002 | char *identity; | 1002 | char *identity; |
@@ -1050,7 +1050,7 @@ delete_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
1050 | const char *url, | 1050 | const char *url, |
1051 | void *cls) | 1051 | void *cls) |
1052 | { | 1052 | { |
1053 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_key; | 1053 | const struct GNUNET_IDENTITY_PrivateKey *priv_key; |
1054 | struct RequestHandle *handle = cls; | 1054 | struct RequestHandle *handle = cls; |
1055 | struct GNUNET_RECLAIM_Attribute attr; | 1055 | struct GNUNET_RECLAIM_Attribute attr; |
1056 | struct EgoEntry *ego_entry; | 1056 | struct EgoEntry *ego_entry; |
@@ -1108,11 +1108,11 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
1108 | const char *url, | 1108 | const char *url, |
1109 | void *cls) | 1109 | void *cls) |
1110 | { | 1110 | { |
1111 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity_priv; | 1111 | const struct GNUNET_IDENTITY_PrivateKey *identity_priv; |
1112 | struct RequestHandle *handle = cls; | 1112 | struct RequestHandle *handle = cls; |
1113 | struct EgoEntry *ego_entry; | 1113 | struct EgoEntry *ego_entry; |
1114 | struct GNUNET_RECLAIM_Ticket *ticket = NULL; | 1114 | struct GNUNET_RECLAIM_Ticket *ticket = NULL; |
1115 | struct GNUNET_CRYPTO_EcdsaPublicKey tmp_pk; | 1115 | struct GNUNET_IDENTITY_PublicKey tmp_pk; |
1116 | char term_data[handle->rest_handle->data_size + 1]; | 1116 | char term_data[handle->rest_handle->data_size + 1]; |
1117 | json_t *data_json; | 1117 | json_t *data_json; |
1118 | json_error_t err; | 1118 | json_error_t err; |
@@ -1156,7 +1156,7 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
1156 | GNUNET_IDENTITY_ego_get_public_key (ego_entry->ego, &tmp_pk); | 1156 | GNUNET_IDENTITY_ego_get_public_key (ego_entry->ego, &tmp_pk); |
1157 | if (0 == memcmp (&ticket->identity, | 1157 | if (0 == memcmp (&ticket->identity, |
1158 | &tmp_pk, | 1158 | &tmp_pk, |
1159 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey))) | 1159 | sizeof(struct GNUNET_IDENTITY_PublicKey))) |
1160 | break; | 1160 | break; |
1161 | } | 1161 | } |
1162 | if (NULL == ego_entry) | 1162 | if (NULL == ego_entry) |
@@ -1178,7 +1178,7 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
1178 | 1178 | ||
1179 | static void | 1179 | static void |
1180 | consume_cont (void *cls, | 1180 | consume_cont (void *cls, |
1181 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 1181 | const struct GNUNET_IDENTITY_PublicKey *identity, |
1182 | const struct GNUNET_RECLAIM_Attribute *attr, | 1182 | const struct GNUNET_RECLAIM_Attribute *attr, |
1183 | const struct GNUNET_RECLAIM_Presentation *pres) | 1183 | const struct GNUNET_RECLAIM_Presentation *pres) |
1184 | { | 1184 | { |
@@ -1215,11 +1215,11 @@ consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
1215 | const char *url, | 1215 | const char *url, |
1216 | void *cls) | 1216 | void *cls) |
1217 | { | 1217 | { |
1218 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity_priv; | 1218 | const struct GNUNET_IDENTITY_PrivateKey *identity_priv; |
1219 | struct RequestHandle *handle = cls; | 1219 | struct RequestHandle *handle = cls; |
1220 | struct EgoEntry *ego_entry; | 1220 | struct EgoEntry *ego_entry; |
1221 | struct GNUNET_RECLAIM_Ticket *ticket; | 1221 | struct GNUNET_RECLAIM_Ticket *ticket; |
1222 | struct GNUNET_CRYPTO_EcdsaPublicKey tmp_pk; | 1222 | struct GNUNET_IDENTITY_PublicKey tmp_pk; |
1223 | char term_data[handle->rest_handle->data_size + 1]; | 1223 | char term_data[handle->rest_handle->data_size + 1]; |
1224 | json_t *data_json; | 1224 | json_t *data_json; |
1225 | json_error_t err; | 1225 | json_error_t err; |
@@ -1259,7 +1259,7 @@ consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
1259 | GNUNET_IDENTITY_ego_get_public_key (ego_entry->ego, &tmp_pk); | 1259 | GNUNET_IDENTITY_ego_get_public_key (ego_entry->ego, &tmp_pk); |
1260 | if (0 == memcmp (&ticket->audience, | 1260 | if (0 == memcmp (&ticket->audience, |
1261 | &tmp_pk, | 1261 | &tmp_pk, |
1262 | sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey))) | 1262 | sizeof(struct GNUNET_IDENTITY_PublicKey))) |
1263 | break; | 1263 | break; |
1264 | } | 1264 | } |
1265 | if (NULL == ego_entry) | 1265 | if (NULL == ego_entry) |
@@ -1343,7 +1343,7 @@ list_ego (void *cls, | |||
1343 | const char *identifier) | 1343 | const char *identifier) |
1344 | { | 1344 | { |
1345 | struct EgoEntry *ego_entry; | 1345 | struct EgoEntry *ego_entry; |
1346 | struct GNUNET_CRYPTO_EcdsaPublicKey pk; | 1346 | struct GNUNET_IDENTITY_PublicKey pk; |
1347 | 1347 | ||
1348 | if ((NULL == ego) && (ID_REST_STATE_INIT == state)) | 1348 | if ((NULL == ego) && (ID_REST_STATE_INIT == state)) |
1349 | { | 1349 | { |
@@ -1354,7 +1354,7 @@ list_ego (void *cls, | |||
1354 | { | 1354 | { |
1355 | ego_entry = GNUNET_new (struct EgoEntry); | 1355 | ego_entry = GNUNET_new (struct EgoEntry); |
1356 | GNUNET_IDENTITY_ego_get_public_key (ego, &pk); | 1356 | GNUNET_IDENTITY_ego_get_public_key (ego, &pk); |
1357 | ego_entry->keystring = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk); | 1357 | ego_entry->keystring = GNUNET_IDENTITY_public_key_to_string (&pk); |
1358 | ego_entry->ego = ego; | 1358 | ego_entry->ego = ego; |
1359 | ego_entry->identifier = GNUNET_strdup (identifier); | 1359 | ego_entry->identifier = GNUNET_strdup (identifier); |
1360 | GNUNET_CONTAINER_DLL_insert_tail (ego_head, | 1360 | GNUNET_CONTAINER_DLL_insert_tail (ego_head, |
@@ -1380,7 +1380,7 @@ list_ego (void *cls, | |||
1380 | /* Add */ | 1380 | /* Add */ |
1381 | ego_entry = GNUNET_new (struct EgoEntry); | 1381 | ego_entry = GNUNET_new (struct EgoEntry); |
1382 | GNUNET_IDENTITY_ego_get_public_key (ego, &pk); | 1382 | GNUNET_IDENTITY_ego_get_public_key (ego, &pk); |
1383 | ego_entry->keystring = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk); | 1383 | ego_entry->keystring = GNUNET_IDENTITY_public_key_to_string (&pk); |
1384 | ego_entry->ego = ego; | 1384 | ego_entry->ego = ego; |
1385 | ego_entry->identifier = GNUNET_strdup (identifier); | 1385 | ego_entry->identifier = GNUNET_strdup (identifier); |
1386 | GNUNET_CONTAINER_DLL_insert_tail (ego_head, | 1386 | GNUNET_CONTAINER_DLL_insert_tail (ego_head, |
diff --git a/src/reclaim/reclaim.h b/src/reclaim/reclaim.h index bc7f34365..aae8ee89a 100644 --- a/src/reclaim/reclaim.h +++ b/src/reclaim/reclaim.h | |||
@@ -29,7 +29,7 @@ | |||
29 | #define RECLAIM_H | 29 | #define RECLAIM_H |
30 | 30 | ||
31 | #include "gnunet_common.h" | 31 | #include "gnunet_common.h" |
32 | 32 | #include "gnunet_identity_service.h" | |
33 | 33 | ||
34 | GNUNET_NETWORK_STRUCT_BEGIN | 34 | GNUNET_NETWORK_STRUCT_BEGIN |
35 | 35 | ||
@@ -62,7 +62,7 @@ struct AttributeStoreMessage | |||
62 | /** | 62 | /** |
63 | * Identity | 63 | * Identity |
64 | */ | 64 | */ |
65 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 65 | struct GNUNET_IDENTITY_PrivateKey identity; |
66 | 66 | ||
67 | /* followed by the serialized attribute */ | 67 | /* followed by the serialized attribute */ |
68 | }; | 68 | }; |
@@ -91,7 +91,7 @@ struct AttributeDeleteMessage | |||
91 | /** | 91 | /** |
92 | * Identity | 92 | * Identity |
93 | */ | 93 | */ |
94 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 94 | struct GNUNET_IDENTITY_PrivateKey identity; |
95 | 95 | ||
96 | /* followed by the serialized attribute */ | 96 | /* followed by the serialized attribute */ |
97 | }; | 97 | }; |
@@ -151,7 +151,7 @@ struct AttributeResultMessage | |||
151 | /** | 151 | /** |
152 | * The public key of the identity. | 152 | * The public key of the identity. |
153 | */ | 153 | */ |
154 | struct GNUNET_CRYPTO_EcdsaPublicKey identity; | 154 | struct GNUNET_IDENTITY_PublicKey identity; |
155 | 155 | ||
156 | /* followed by: | 156 | /* followed by: |
157 | * serialized attribute data | 157 | * serialized attribute data |
@@ -186,7 +186,7 @@ struct CredentialResultMessage | |||
186 | /** | 186 | /** |
187 | * The public key of the identity. | 187 | * The public key of the identity. |
188 | */ | 188 | */ |
189 | struct GNUNET_CRYPTO_EcdsaPublicKey identity; | 189 | struct GNUNET_IDENTITY_PublicKey identity; |
190 | 190 | ||
191 | /* followed by: | 191 | /* followed by: |
192 | * serialized credential data | 192 | * serialized credential data |
@@ -212,7 +212,7 @@ struct AttributeIterationStartMessage | |||
212 | /** | 212 | /** |
213 | * Identity. | 213 | * Identity. |
214 | */ | 214 | */ |
215 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 215 | struct GNUNET_IDENTITY_PrivateKey identity; |
216 | }; | 216 | }; |
217 | 217 | ||
218 | 218 | ||
@@ -251,7 +251,7 @@ struct CredentialIterationStartMessage | |||
251 | /** | 251 | /** |
252 | * Identity. | 252 | * Identity. |
253 | */ | 253 | */ |
254 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 254 | struct GNUNET_IDENTITY_PrivateKey identity; |
255 | }; | 255 | }; |
256 | 256 | ||
257 | 257 | ||
@@ -323,7 +323,7 @@ struct TicketIterationStartMessage | |||
323 | /** | 323 | /** |
324 | * Identity. | 324 | * Identity. |
325 | */ | 325 | */ |
326 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 326 | struct GNUNET_IDENTITY_PrivateKey identity; |
327 | }; | 327 | }; |
328 | 328 | ||
329 | 329 | ||
@@ -379,12 +379,12 @@ struct IssueTicketMessage | |||
379 | /** | 379 | /** |
380 | * Identity. | 380 | * Identity. |
381 | */ | 381 | */ |
382 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 382 | struct GNUNET_IDENTITY_PrivateKey identity; |
383 | 383 | ||
384 | /** | 384 | /** |
385 | * Requesting party. | 385 | * Requesting party. |
386 | */ | 386 | */ |
387 | struct GNUNET_CRYPTO_EcdsaPublicKey rp; | 387 | struct GNUNET_IDENTITY_PublicKey rp; |
388 | 388 | ||
389 | /** | 389 | /** |
390 | * length of serialized attribute list | 390 | * length of serialized attribute list |
@@ -412,7 +412,7 @@ struct RevokeTicketMessage | |||
412 | /** | 412 | /** |
413 | * Identity. | 413 | * Identity. |
414 | */ | 414 | */ |
415 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 415 | struct GNUNET_IDENTITY_PrivateKey identity; |
416 | 416 | ||
417 | /** | 417 | /** |
418 | * length of serialized attribute list | 418 | * length of serialized attribute list |
@@ -493,7 +493,7 @@ struct ConsumeTicketMessage | |||
493 | /** | 493 | /** |
494 | * Identity. | 494 | * Identity. |
495 | */ | 495 | */ |
496 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 496 | struct GNUNET_IDENTITY_PrivateKey identity; |
497 | 497 | ||
498 | /** | 498 | /** |
499 | * The ticket to consume | 499 | * The ticket to consume |
@@ -539,7 +539,7 @@ struct ConsumeTicketResultMessage | |||
539 | /** | 539 | /** |
540 | * The public key of the identity. | 540 | * The public key of the identity. |
541 | */ | 541 | */ |
542 | struct GNUNET_CRYPTO_EcdsaPublicKey identity; | 542 | struct GNUNET_IDENTITY_PublicKey identity; |
543 | 543 | ||
544 | /* followed by: | 544 | /* followed by: |
545 | * serialized attributes data | 545 | * serialized attributes data |
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c index 1e0251519..f4f2b946a 100644 --- a/src/reclaim/reclaim_api.c +++ b/src/reclaim/reclaim_api.c | |||
@@ -235,7 +235,7 @@ struct GNUNET_RECLAIM_AttributeIterator | |||
235 | /** | 235 | /** |
236 | * Private key of the zone. | 236 | * Private key of the zone. |
237 | */ | 237 | */ |
238 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 238 | struct GNUNET_IDENTITY_PrivateKey identity; |
239 | 239 | ||
240 | /** | 240 | /** |
241 | * The operation id this zone iteration operation has | 241 | * The operation id this zone iteration operation has |
@@ -302,7 +302,7 @@ struct GNUNET_RECLAIM_CredentialIterator | |||
302 | /** | 302 | /** |
303 | * Private key of the zone. | 303 | * Private key of the zone. |
304 | */ | 304 | */ |
305 | struct GNUNET_CRYPTO_EcdsaPrivateKey identity; | 305 | struct GNUNET_IDENTITY_PrivateKey identity; |
306 | 306 | ||
307 | /** | 307 | /** |
308 | * The operation id this zone iteration operation has | 308 | * The operation id this zone iteration operation has |
@@ -704,7 +704,7 @@ check_attribute_result (void *cls, const struct AttributeResultMessage *msg) | |||
704 | static void | 704 | static void |
705 | handle_attribute_result (void *cls, const struct AttributeResultMessage *msg) | 705 | handle_attribute_result (void *cls, const struct AttributeResultMessage *msg) |
706 | { | 706 | { |
707 | static struct GNUNET_CRYPTO_EcdsaPrivateKey identity_dummy; | 707 | static struct GNUNET_IDENTITY_PrivateKey identity_dummy; |
708 | struct GNUNET_RECLAIM_Handle *h = cls; | 708 | struct GNUNET_RECLAIM_Handle *h = cls; |
709 | struct GNUNET_RECLAIM_AttributeIterator *it; | 709 | struct GNUNET_RECLAIM_AttributeIterator *it; |
710 | struct GNUNET_RECLAIM_Operation *op; | 710 | struct GNUNET_RECLAIM_Operation *op; |
@@ -806,7 +806,7 @@ static void | |||
806 | handle_credential_result (void *cls, const struct | 806 | handle_credential_result (void *cls, const struct |
807 | CredentialResultMessage *msg) | 807 | CredentialResultMessage *msg) |
808 | { | 808 | { |
809 | static struct GNUNET_CRYPTO_EcdsaPrivateKey identity_dummy; | 809 | static struct GNUNET_IDENTITY_PrivateKey identity_dummy; |
810 | struct GNUNET_RECLAIM_Handle *h = cls; | 810 | struct GNUNET_RECLAIM_Handle *h = cls; |
811 | struct GNUNET_RECLAIM_CredentialIterator *it; | 811 | struct GNUNET_RECLAIM_CredentialIterator *it; |
812 | struct GNUNET_RECLAIM_Operation *op; | 812 | struct GNUNET_RECLAIM_Operation *op; |
@@ -1134,7 +1134,7 @@ GNUNET_RECLAIM_disconnect (struct GNUNET_RECLAIM_Handle *h) | |||
1134 | struct GNUNET_RECLAIM_Operation * | 1134 | struct GNUNET_RECLAIM_Operation * |
1135 | GNUNET_RECLAIM_attribute_store ( | 1135 | GNUNET_RECLAIM_attribute_store ( |
1136 | struct GNUNET_RECLAIM_Handle *h, | 1136 | struct GNUNET_RECLAIM_Handle *h, |
1137 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, | 1137 | const struct GNUNET_IDENTITY_PrivateKey *pkey, |
1138 | const struct GNUNET_RECLAIM_Attribute *attr, | 1138 | const struct GNUNET_RECLAIM_Attribute *attr, |
1139 | const struct GNUNET_TIME_Relative *exp_interval, | 1139 | const struct GNUNET_TIME_Relative *exp_interval, |
1140 | GNUNET_RECLAIM_ContinuationWithStatus cont, | 1140 | GNUNET_RECLAIM_ContinuationWithStatus cont, |
@@ -1181,7 +1181,7 @@ GNUNET_RECLAIM_attribute_store ( | |||
1181 | struct GNUNET_RECLAIM_Operation * | 1181 | struct GNUNET_RECLAIM_Operation * |
1182 | GNUNET_RECLAIM_attribute_delete ( | 1182 | GNUNET_RECLAIM_attribute_delete ( |
1183 | struct GNUNET_RECLAIM_Handle *h, | 1183 | struct GNUNET_RECLAIM_Handle *h, |
1184 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, | 1184 | const struct GNUNET_IDENTITY_PrivateKey *pkey, |
1185 | const struct GNUNET_RECLAIM_Attribute *attr, | 1185 | const struct GNUNET_RECLAIM_Attribute *attr, |
1186 | GNUNET_RECLAIM_ContinuationWithStatus cont, | 1186 | GNUNET_RECLAIM_ContinuationWithStatus cont, |
1187 | void *cont_cls) | 1187 | void *cont_cls) |
@@ -1226,7 +1226,7 @@ GNUNET_RECLAIM_attribute_delete ( | |||
1226 | struct GNUNET_RECLAIM_Operation * | 1226 | struct GNUNET_RECLAIM_Operation * |
1227 | GNUNET_RECLAIM_credential_store ( | 1227 | GNUNET_RECLAIM_credential_store ( |
1228 | struct GNUNET_RECLAIM_Handle *h, | 1228 | struct GNUNET_RECLAIM_Handle *h, |
1229 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, | 1229 | const struct GNUNET_IDENTITY_PrivateKey *pkey, |
1230 | const struct GNUNET_RECLAIM_Credential *attr, | 1230 | const struct GNUNET_RECLAIM_Credential *attr, |
1231 | const struct GNUNET_TIME_Relative *exp_interval, | 1231 | const struct GNUNET_TIME_Relative *exp_interval, |
1232 | GNUNET_RECLAIM_ContinuationWithStatus cont, | 1232 | GNUNET_RECLAIM_ContinuationWithStatus cont, |
@@ -1273,7 +1273,7 @@ GNUNET_RECLAIM_credential_store ( | |||
1273 | struct GNUNET_RECLAIM_Operation * | 1273 | struct GNUNET_RECLAIM_Operation * |
1274 | GNUNET_RECLAIM_credential_delete ( | 1274 | GNUNET_RECLAIM_credential_delete ( |
1275 | struct GNUNET_RECLAIM_Handle *h, | 1275 | struct GNUNET_RECLAIM_Handle *h, |
1276 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, | 1276 | const struct GNUNET_IDENTITY_PrivateKey *pkey, |
1277 | const struct GNUNET_RECLAIM_Credential *attr, | 1277 | const struct GNUNET_RECLAIM_Credential *attr, |
1278 | GNUNET_RECLAIM_ContinuationWithStatus cont, | 1278 | GNUNET_RECLAIM_ContinuationWithStatus cont, |
1279 | void *cont_cls) | 1279 | void *cont_cls) |
@@ -1330,7 +1330,7 @@ GNUNET_RECLAIM_credential_delete ( | |||
1330 | struct GNUNET_RECLAIM_AttributeIterator * | 1330 | struct GNUNET_RECLAIM_AttributeIterator * |
1331 | GNUNET_RECLAIM_get_attributes_start ( | 1331 | GNUNET_RECLAIM_get_attributes_start ( |
1332 | struct GNUNET_RECLAIM_Handle *h, | 1332 | struct GNUNET_RECLAIM_Handle *h, |
1333 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 1333 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
1334 | GNUNET_SCHEDULER_TaskCallback error_cb, | 1334 | GNUNET_SCHEDULER_TaskCallback error_cb, |
1335 | void *error_cb_cls, | 1335 | void *error_cb_cls, |
1336 | GNUNET_RECLAIM_AttributeResult proc, | 1336 | GNUNET_RECLAIM_AttributeResult proc, |
@@ -1439,7 +1439,7 @@ GNUNET_RECLAIM_get_attributes_stop (struct GNUNET_RECLAIM_AttributeIterator *it) | |||
1439 | struct GNUNET_RECLAIM_CredentialIterator * | 1439 | struct GNUNET_RECLAIM_CredentialIterator * |
1440 | GNUNET_RECLAIM_get_credentials_start ( | 1440 | GNUNET_RECLAIM_get_credentials_start ( |
1441 | struct GNUNET_RECLAIM_Handle *h, | 1441 | struct GNUNET_RECLAIM_Handle *h, |
1442 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 1442 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
1443 | GNUNET_SCHEDULER_TaskCallback error_cb, | 1443 | GNUNET_SCHEDULER_TaskCallback error_cb, |
1444 | void *error_cb_cls, | 1444 | void *error_cb_cls, |
1445 | GNUNET_RECLAIM_CredentialResult proc, | 1445 | GNUNET_RECLAIM_CredentialResult proc, |
@@ -1541,8 +1541,8 @@ GNUNET_RECLAIM_get_credentials_stop (struct | |||
1541 | struct GNUNET_RECLAIM_Operation * | 1541 | struct GNUNET_RECLAIM_Operation * |
1542 | GNUNET_RECLAIM_ticket_issue ( | 1542 | GNUNET_RECLAIM_ticket_issue ( |
1543 | struct GNUNET_RECLAIM_Handle *h, | 1543 | struct GNUNET_RECLAIM_Handle *h, |
1544 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss, | 1544 | const struct GNUNET_IDENTITY_PrivateKey *iss, |
1545 | const struct GNUNET_CRYPTO_EcdsaPublicKey *rp, | 1545 | const struct GNUNET_IDENTITY_PublicKey *rp, |
1546 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 1546 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
1547 | GNUNET_RECLAIM_IssueTicketCallback cb, | 1547 | GNUNET_RECLAIM_IssueTicketCallback cb, |
1548 | void *cb_cls) | 1548 | void *cb_cls) |
@@ -1590,7 +1590,7 @@ GNUNET_RECLAIM_ticket_issue ( | |||
1590 | struct GNUNET_RECLAIM_Operation * | 1590 | struct GNUNET_RECLAIM_Operation * |
1591 | GNUNET_RECLAIM_ticket_consume ( | 1591 | GNUNET_RECLAIM_ticket_consume ( |
1592 | struct GNUNET_RECLAIM_Handle *h, | 1592 | struct GNUNET_RECLAIM_Handle *h, |
1593 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 1593 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
1594 | const struct GNUNET_RECLAIM_Ticket *ticket, | 1594 | const struct GNUNET_RECLAIM_Ticket *ticket, |
1595 | GNUNET_RECLAIM_AttributeTicketResult cb, | 1595 | GNUNET_RECLAIM_AttributeTicketResult cb, |
1596 | void *cb_cls) | 1596 | void *cb_cls) |
@@ -1636,7 +1636,7 @@ GNUNET_RECLAIM_ticket_consume ( | |||
1636 | struct GNUNET_RECLAIM_TicketIterator * | 1636 | struct GNUNET_RECLAIM_TicketIterator * |
1637 | GNUNET_RECLAIM_ticket_iteration_start ( | 1637 | GNUNET_RECLAIM_ticket_iteration_start ( |
1638 | struct GNUNET_RECLAIM_Handle *h, | 1638 | struct GNUNET_RECLAIM_Handle *h, |
1639 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 1639 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
1640 | GNUNET_SCHEDULER_TaskCallback error_cb, | 1640 | GNUNET_SCHEDULER_TaskCallback error_cb, |
1641 | void *error_cb_cls, | 1641 | void *error_cb_cls, |
1642 | GNUNET_RECLAIM_TicketCallback proc, | 1642 | GNUNET_RECLAIM_TicketCallback proc, |
@@ -1731,7 +1731,7 @@ GNUNET_RECLAIM_ticket_iteration_stop (struct GNUNET_RECLAIM_TicketIterator *it) | |||
1731 | struct GNUNET_RECLAIM_Operation * | 1731 | struct GNUNET_RECLAIM_Operation * |
1732 | GNUNET_RECLAIM_ticket_revoke ( | 1732 | GNUNET_RECLAIM_ticket_revoke ( |
1733 | struct GNUNET_RECLAIM_Handle *h, | 1733 | struct GNUNET_RECLAIM_Handle *h, |
1734 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 1734 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
1735 | const struct GNUNET_RECLAIM_Ticket *ticket, | 1735 | const struct GNUNET_RECLAIM_Ticket *ticket, |
1736 | GNUNET_RECLAIM_ContinuationWithStatus cb, | 1736 | GNUNET_RECLAIM_ContinuationWithStatus cb, |
1737 | void *cb_cls) | 1737 | void *cb_cls) |
diff --git a/src/reclaim/test_reclaim_attribute.c b/src/reclaim/test_reclaim_attribute.c index f71d86b56..f8faf8021 100644 --- a/src/reclaim/test_reclaim_attribute.c +++ b/src/reclaim/test_reclaim_attribute.c | |||
@@ -9,12 +9,10 @@ main (int argc, char *argv[]) | |||
9 | struct GNUNET_RECLAIM_AttributeList *al; | 9 | struct GNUNET_RECLAIM_AttributeList *al; |
10 | struct GNUNET_RECLAIM_AttributeList *al_two; | 10 | struct GNUNET_RECLAIM_AttributeList *al_two; |
11 | struct GNUNET_RECLAIM_AttributeListEntry *ale; | 11 | struct GNUNET_RECLAIM_AttributeListEntry *ale; |
12 | struct GNUNET_RECLAIM_Attribute *attr; | ||
13 | char attrname[100]; | 12 | char attrname[100]; |
14 | char attrdata[100]; | 13 | char attrdata[100]; |
15 | size_t ser_len_claimed; | 14 | size_t ser_len_claimed; |
16 | size_t ser_len_actual; | 15 | size_t ser_len_actual; |
17 | ssize_t deser_len; | ||
18 | char *ser_data; | 16 | char *ser_data; |
19 | int count = 0; | 17 | int count = 0; |
20 | 18 | ||