diff options
Diffstat (limited to 'src/include/gnunet_reclaim_service.h')
-rw-r--r-- | src/include/gnunet_reclaim_service.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h index 368058f56..8549081a1 100644 --- a/src/include/gnunet_reclaim_service.h +++ b/src/include/gnunet_reclaim_service.h | |||
@@ -38,6 +38,7 @@ extern "C" { | |||
38 | #endif | 38 | #endif |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #include "gnunet_identity_service.h" | ||
41 | #include "gnunet_reclaim_lib.h" | 42 | #include "gnunet_reclaim_lib.h" |
42 | #include "gnunet_util_lib.h" | 43 | #include "gnunet_util_lib.h" |
43 | 44 | ||
@@ -69,12 +70,12 @@ struct GNUNET_RECLAIM_Ticket | |||
69 | /** | 70 | /** |
70 | * The ticket issuer (= the user) | 71 | * The ticket issuer (= the user) |
71 | */ | 72 | */ |
72 | struct GNUNET_CRYPTO_EcdsaPublicKey identity; | 73 | struct GNUNET_IDENTITY_PublicKey identity; |
73 | 74 | ||
74 | /** | 75 | /** |
75 | * The ticket audience (= relying party) | 76 | * The ticket audience (= relying party) |
76 | */ | 77 | */ |
77 | struct GNUNET_CRYPTO_EcdsaPublicKey audience; | 78 | struct GNUNET_IDENTITY_PublicKey audience; |
78 | 79 | ||
79 | /** | 80 | /** |
80 | * The ticket random identifier | 81 | * The ticket random identifier |
@@ -129,7 +130,7 @@ typedef void (*GNUNET_RECLAIM_ContinuationWithStatus) (void *cls, | |||
129 | * @param attr The attribute | 130 | * @param attr The attribute |
130 | */ | 131 | */ |
131 | typedef void (*GNUNET_RECLAIM_AttributeResult) ( | 132 | typedef void (*GNUNET_RECLAIM_AttributeResult) ( |
132 | void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 133 | void *cls, const struct GNUNET_IDENTITY_PublicKey *identity, |
133 | const struct GNUNET_RECLAIM_Attribute *attr); | 134 | const struct GNUNET_RECLAIM_Attribute *attr); |
134 | 135 | ||
135 | /** | 136 | /** |
@@ -141,7 +142,7 @@ typedef void (*GNUNET_RECLAIM_AttributeResult) ( | |||
141 | * @param presentation The presentation for the credential (may be NULL) | 142 | * @param presentation The presentation for the credential (may be NULL) |
142 | */ | 143 | */ |
143 | typedef void (*GNUNET_RECLAIM_AttributeTicketResult) ( | 144 | typedef void (*GNUNET_RECLAIM_AttributeTicketResult) ( |
144 | void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 145 | void *cls, const struct GNUNET_IDENTITY_PublicKey *identity, |
145 | const struct GNUNET_RECLAIM_Attribute *attr, | 146 | const struct GNUNET_RECLAIM_Attribute *attr, |
146 | const struct GNUNET_RECLAIM_Presentation *presentation); | 147 | const struct GNUNET_RECLAIM_Presentation *presentation); |
147 | 148 | ||
@@ -155,7 +156,7 @@ typedef void (*GNUNET_RECLAIM_AttributeTicketResult) ( | |||
155 | * @param attributes the parsed attributes | 156 | * @param attributes the parsed attributes |
156 | */ | 157 | */ |
157 | typedef void (*GNUNET_RECLAIM_CredentialResult) ( | 158 | typedef void (*GNUNET_RECLAIM_CredentialResult) ( |
158 | void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 159 | void *cls, const struct GNUNET_IDENTITY_PublicKey *identity, |
159 | const struct GNUNET_RECLAIM_Credential *credential); | 160 | const struct GNUNET_RECLAIM_Credential *credential); |
160 | 161 | ||
161 | 162 | ||
@@ -184,7 +185,7 @@ GNUNET_RECLAIM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); | |||
184 | struct GNUNET_RECLAIM_Operation * | 185 | struct GNUNET_RECLAIM_Operation * |
185 | GNUNET_RECLAIM_attribute_store ( | 186 | GNUNET_RECLAIM_attribute_store ( |
186 | struct GNUNET_RECLAIM_Handle *h, | 187 | struct GNUNET_RECLAIM_Handle *h, |
187 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, | 188 | const struct GNUNET_IDENTITY_PrivateKey *pkey, |
188 | const struct GNUNET_RECLAIM_Attribute *attr, | 189 | const struct GNUNET_RECLAIM_Attribute *attr, |
189 | const struct GNUNET_TIME_Relative *exp_interval, | 190 | const struct GNUNET_TIME_Relative *exp_interval, |
190 | GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls); | 191 | GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls); |
@@ -205,7 +206,7 @@ GNUNET_RECLAIM_attribute_store ( | |||
205 | struct GNUNET_RECLAIM_Operation * | 206 | struct GNUNET_RECLAIM_Operation * |
206 | GNUNET_RECLAIM_credential_store ( | 207 | GNUNET_RECLAIM_credential_store ( |
207 | struct GNUNET_RECLAIM_Handle *h, | 208 | struct GNUNET_RECLAIM_Handle *h, |
208 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, | 209 | const struct GNUNET_IDENTITY_PrivateKey *pkey, |
209 | const struct GNUNET_RECLAIM_Credential *credential, | 210 | const struct GNUNET_RECLAIM_Credential *credential, |
210 | const struct GNUNET_TIME_Relative *exp_interval, | 211 | const struct GNUNET_TIME_Relative *exp_interval, |
211 | GNUNET_RECLAIM_ContinuationWithStatus cont, | 212 | GNUNET_RECLAIM_ContinuationWithStatus cont, |
@@ -226,7 +227,7 @@ GNUNET_RECLAIM_credential_store ( | |||
226 | struct GNUNET_RECLAIM_Operation * | 227 | struct GNUNET_RECLAIM_Operation * |
227 | GNUNET_RECLAIM_attribute_delete ( | 228 | GNUNET_RECLAIM_attribute_delete ( |
228 | struct GNUNET_RECLAIM_Handle *h, | 229 | struct GNUNET_RECLAIM_Handle *h, |
229 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, | 230 | const struct GNUNET_IDENTITY_PrivateKey *pkey, |
230 | const struct GNUNET_RECLAIM_Attribute *attr, | 231 | const struct GNUNET_RECLAIM_Attribute *attr, |
231 | GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls); | 232 | GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls); |
232 | 233 | ||
@@ -244,7 +245,7 @@ GNUNET_RECLAIM_attribute_delete ( | |||
244 | struct GNUNET_RECLAIM_Operation * | 245 | struct GNUNET_RECLAIM_Operation * |
245 | GNUNET_RECLAIM_credential_delete ( | 246 | GNUNET_RECLAIM_credential_delete ( |
246 | struct GNUNET_RECLAIM_Handle *h, | 247 | struct GNUNET_RECLAIM_Handle *h, |
247 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, | 248 | const struct GNUNET_IDENTITY_PrivateKey *pkey, |
248 | const struct GNUNET_RECLAIM_Credential *cred, | 249 | const struct GNUNET_RECLAIM_Credential *cred, |
249 | GNUNET_RECLAIM_ContinuationWithStatus cont, | 250 | GNUNET_RECLAIM_ContinuationWithStatus cont, |
250 | void *cont_cls); | 251 | void *cont_cls); |
@@ -276,7 +277,7 @@ GNUNET_RECLAIM_credential_delete ( | |||
276 | struct GNUNET_RECLAIM_AttributeIterator * | 277 | struct GNUNET_RECLAIM_AttributeIterator * |
277 | GNUNET_RECLAIM_get_attributes_start ( | 278 | GNUNET_RECLAIM_get_attributes_start ( |
278 | struct GNUNET_RECLAIM_Handle *h, | 279 | struct GNUNET_RECLAIM_Handle *h, |
279 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 280 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
280 | GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls, | 281 | GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls, |
281 | GNUNET_RECLAIM_AttributeResult proc, void *proc_cls, | 282 | GNUNET_RECLAIM_AttributeResult proc, void *proc_cls, |
282 | GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls); | 283 | GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls); |
@@ -332,7 +333,7 @@ GNUNET_RECLAIM_get_attributes_stop ( | |||
332 | struct GNUNET_RECLAIM_CredentialIterator * | 333 | struct GNUNET_RECLAIM_CredentialIterator * |
333 | GNUNET_RECLAIM_get_credentials_start ( | 334 | GNUNET_RECLAIM_get_credentials_start ( |
334 | struct GNUNET_RECLAIM_Handle *h, | 335 | struct GNUNET_RECLAIM_Handle *h, |
335 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 336 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
336 | GNUNET_SCHEDULER_TaskCallback error_cb, | 337 | GNUNET_SCHEDULER_TaskCallback error_cb, |
337 | void *error_cb_cls, | 338 | void *error_cb_cls, |
338 | GNUNET_RECLAIM_CredentialResult proc, | 339 | GNUNET_RECLAIM_CredentialResult proc, |
@@ -380,8 +381,8 @@ GNUNET_RECLAIM_get_credentials_stop ( | |||
380 | struct GNUNET_RECLAIM_Operation * | 381 | struct GNUNET_RECLAIM_Operation * |
381 | GNUNET_RECLAIM_ticket_issue ( | 382 | GNUNET_RECLAIM_ticket_issue ( |
382 | struct GNUNET_RECLAIM_Handle *h, | 383 | struct GNUNET_RECLAIM_Handle *h, |
383 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss, | 384 | const struct GNUNET_IDENTITY_PrivateKey *iss, |
384 | const struct GNUNET_CRYPTO_EcdsaPublicKey *rp, | 385 | const struct GNUNET_IDENTITY_PublicKey *rp, |
385 | const struct GNUNET_RECLAIM_AttributeList *attrs, | 386 | const struct GNUNET_RECLAIM_AttributeList *attrs, |
386 | GNUNET_RECLAIM_IssueTicketCallback cb, void *cb_cls); | 387 | GNUNET_RECLAIM_IssueTicketCallback cb, void *cb_cls); |
387 | 388 | ||
@@ -402,7 +403,7 @@ GNUNET_RECLAIM_ticket_issue ( | |||
402 | struct GNUNET_RECLAIM_Operation * | 403 | struct GNUNET_RECLAIM_Operation * |
403 | GNUNET_RECLAIM_ticket_revoke ( | 404 | GNUNET_RECLAIM_ticket_revoke ( |
404 | struct GNUNET_RECLAIM_Handle *h, | 405 | struct GNUNET_RECLAIM_Handle *h, |
405 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 406 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
406 | const struct GNUNET_RECLAIM_Ticket *ticket, | 407 | const struct GNUNET_RECLAIM_Ticket *ticket, |
407 | GNUNET_RECLAIM_ContinuationWithStatus cb, void *cb_cls); | 408 | GNUNET_RECLAIM_ContinuationWithStatus cb, void *cb_cls); |
408 | 409 | ||
@@ -422,7 +423,7 @@ GNUNET_RECLAIM_ticket_revoke ( | |||
422 | struct GNUNET_RECLAIM_Operation * | 423 | struct GNUNET_RECLAIM_Operation * |
423 | GNUNET_RECLAIM_ticket_consume ( | 424 | GNUNET_RECLAIM_ticket_consume ( |
424 | struct GNUNET_RECLAIM_Handle *h, | 425 | struct GNUNET_RECLAIM_Handle *h, |
425 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 426 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
426 | const struct GNUNET_RECLAIM_Ticket *ticket, | 427 | const struct GNUNET_RECLAIM_Ticket *ticket, |
427 | GNUNET_RECLAIM_AttributeTicketResult cb, void *cb_cls); | 428 | GNUNET_RECLAIM_AttributeTicketResult cb, void *cb_cls); |
428 | 429 | ||
@@ -447,7 +448,7 @@ GNUNET_RECLAIM_ticket_consume ( | |||
447 | struct GNUNET_RECLAIM_TicketIterator * | 448 | struct GNUNET_RECLAIM_TicketIterator * |
448 | GNUNET_RECLAIM_ticket_iteration_start ( | 449 | GNUNET_RECLAIM_ticket_iteration_start ( |
449 | struct GNUNET_RECLAIM_Handle *h, | 450 | struct GNUNET_RECLAIM_Handle *h, |
450 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 451 | const struct GNUNET_IDENTITY_PrivateKey *identity, |
451 | GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls, | 452 | GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls, |
452 | GNUNET_RECLAIM_TicketCallback proc, void *proc_cls, | 453 | GNUNET_RECLAIM_TicketCallback proc, void *proc_cls, |
453 | GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls); | 454 | GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls); |