diff options
author | Markus Voggenreiter <Markus.Voggenreiter@tum.de> | 2019-10-16 18:01:02 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2020-01-13 13:31:02 +0100 |
commit | 483bc7e3095dff908fe8c032ea96995d44304868 (patch) | |
tree | fb435701849ee197b9a073311598867b4088134c | |
parent | 0def2d57eabbf00947ede47b0e968c0a395ace50 (diff) | |
download | gnunet-483bc7e3095dff908fe8c032ea96995d44304868.tar.gz gnunet-483bc7e3095dff908fe8c032ea96995d44304868.zip |
Prepare Listing Attestations
-rw-r--r-- | src/include/gnunet_reclaim_service.h | 3 | ||||
-rw-r--r-- | src/reclaim/gnunet-reclaim.c | 6 | ||||
-rw-r--r-- | src/reclaim/plugin_rest_openid_connect.c | 6 | ||||
-rw-r--r-- | src/reclaim/plugin_rest_reclaim.c | 6 | ||||
-rw-r--r-- | src/reclaim/reclaim_api.c | 12 |
5 files changed, 20 insertions, 13 deletions
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h index 0f63b0c96..e7384fd06 100644 --- a/src/include/gnunet_reclaim_service.h +++ b/src/include/gnunet_reclaim_service.h | |||
@@ -117,7 +117,8 @@ typedef void (*GNUNET_RECLAIM_ContinuationWithStatus) (void *cls, | |||
117 | */ | 117 | */ |
118 | typedef void (*GNUNET_RECLAIM_AttributeResult) ( | 118 | typedef void (*GNUNET_RECLAIM_AttributeResult) ( |
119 | void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 119 | void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
120 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr); | 120 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, |
121 | const struct GNUNET_RECLAIM_ATTESTATION_Claim *attest); | ||
121 | 122 | ||
122 | 123 | ||
123 | /** | 124 | /** |
diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c index 58f8cd6e2..c8ce1d722 100644 --- a/src/reclaim/gnunet-reclaim.c +++ b/src/reclaim/gnunet-reclaim.c | |||
@@ -226,7 +226,8 @@ store_attr_cont (void *cls, int32_t success, const char *emsg) | |||
226 | static void | 226 | static void |
227 | process_attrs (void *cls, | 227 | process_attrs (void *cls, |
228 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 228 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
229 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) | 229 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, |
230 | const struct GNUNET_RECLAIM_ATTESTATION_Claim *attest) | ||
230 | { | 231 | { |
231 | char *value_str; | 232 | char *value_str; |
232 | char *id; | 233 | char *id; |
@@ -445,7 +446,8 @@ iter_finished (void *cls) | |||
445 | static void | 446 | static void |
446 | iter_cb (void *cls, | 447 | iter_cb (void *cls, |
447 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 448 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
448 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) | 449 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, |
450 | const struct GNUNET_RECLAIM_ATTESTATION_Claim *attest) | ||
449 | { | 451 | { |
450 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; | 452 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; |
451 | char *attrs_tmp; | 453 | char *attrs_tmp; |
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c index 92a1de621..2dde89950 100644 --- a/src/reclaim/plugin_rest_openid_connect.c +++ b/src/reclaim/plugin_rest_openid_connect.c | |||
@@ -978,7 +978,8 @@ oidc_collect_finished_cb (void *cls) | |||
978 | static void | 978 | static void |
979 | oidc_attr_collect (void *cls, | 979 | oidc_attr_collect (void *cls, |
980 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 980 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
981 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) | 981 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, |
982 | const struct GNUNET_RECLAIM_ATTESTATION_Claim *attest) | ||
982 | { | 983 | { |
983 | struct RequestHandle *handle = cls; | 984 | struct RequestHandle *handle = cls; |
984 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; | 985 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; |
@@ -1862,7 +1863,8 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle, | |||
1862 | static void | 1863 | static void |
1863 | consume_ticket (void *cls, | 1864 | consume_ticket (void *cls, |
1864 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 1865 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
1865 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) | 1866 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, |
1867 | const struct GNUNET_RECLAIM_ATTESTATION_Claim *attest) | ||
1866 | { | 1868 | { |
1867 | struct RequestHandle *handle = cls; | 1869 | struct RequestHandle *handle = cls; |
1868 | char *tmp_value; | 1870 | char *tmp_value; |
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c index b847b773c..5e586152c 100644 --- a/src/reclaim/plugin_rest_reclaim.c +++ b/src/reclaim/plugin_rest_reclaim.c | |||
@@ -755,7 +755,8 @@ add_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
755 | static void | 755 | static void |
756 | attr_collect (void *cls, | 756 | attr_collect (void *cls, |
757 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 757 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
758 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) | 758 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, |
759 | const struct GNUNET_RECLAIM_ATTESTATION_Claim *attest) | ||
759 | { | 760 | { |
760 | struct RequestHandle *handle = cls; | 761 | struct RequestHandle *handle = cls; |
761 | json_t *attr_obj; | 762 | json_t *attr_obj; |
@@ -987,7 +988,8 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
987 | static void | 988 | static void |
988 | consume_cont (void *cls, | 989 | consume_cont (void *cls, |
989 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 990 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
990 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) | 991 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, |
992 | const struct GNUNET_RECLAIM_ATTESTATION_Claim *attest) | ||
991 | { | 993 | { |
992 | struct RequestHandle *handle = cls; | 994 | struct RequestHandle *handle = cls; |
993 | char *val_str; | 995 | char *val_str; |
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c index ed07f78e1..a66bb69f2 100644 --- a/src/reclaim/reclaim_api.c +++ b/src/reclaim/reclaim_api.c | |||
@@ -504,16 +504,16 @@ handle_consume_ticket_result (void *cls, | |||
504 | { | 504 | { |
505 | if (NULL == attrs) | 505 | if (NULL == attrs) |
506 | { | 506 | { |
507 | op->ar_cb (op->cls, &msg->identity, NULL); | 507 | op->ar_cb (op->cls, &msg->identity, NULL, NULL); |
508 | } | 508 | } |
509 | else | 509 | else |
510 | { | 510 | { |
511 | for (le = attrs->list_head; NULL != le; le = le->next) | 511 | for (le = attrs->list_head; NULL != le; le = le->next) |
512 | op->ar_cb (op->cls, &msg->identity, le->claim); | 512 | op->ar_cb (op->cls, &msg->identity, le->claim, NULL); |
513 | GNUNET_RECLAIM_ATTRIBUTE_list_destroy (attrs); | 513 | GNUNET_RECLAIM_ATTRIBUTE_list_destroy (attrs); |
514 | attrs = NULL; | 514 | attrs = NULL; |
515 | } | 515 | } |
516 | op->ar_cb (op->cls, NULL, NULL); | 516 | op->ar_cb (op->cls, NULL, NULL, NULL); |
517 | } | 517 | } |
518 | GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op); | 518 | GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op); |
519 | free_op (op); | 519 | free_op (op); |
@@ -597,7 +597,7 @@ handle_attribute_result (void *cls, const struct AttributeResultMessage *msg) | |||
597 | if (NULL != op) | 597 | if (NULL != op) |
598 | { | 598 | { |
599 | if (NULL != op->ar_cb) | 599 | if (NULL != op->ar_cb) |
600 | op->ar_cb (op->cls, NULL, NULL); | 600 | op->ar_cb (op->cls, NULL, NULL, NULL); |
601 | GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op); | 601 | GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op); |
602 | free_op (op); | 602 | free_op (op); |
603 | } | 603 | } |
@@ -610,12 +610,12 @@ handle_attribute_result (void *cls, const struct AttributeResultMessage *msg) | |||
610 | if (NULL != it) | 610 | if (NULL != it) |
611 | { | 611 | { |
612 | if (NULL != it->proc) | 612 | if (NULL != it->proc) |
613 | it->proc (it->proc_cls, &msg->identity, attr); | 613 | it->proc (it->proc_cls, &msg->identity, attr, NULL); |
614 | } | 614 | } |
615 | else if (NULL != op) | 615 | else if (NULL != op) |
616 | { | 616 | { |
617 | if (NULL != op->ar_cb) | 617 | if (NULL != op->ar_cb) |
618 | op->ar_cb (op->cls, &msg->identity, attr); | 618 | op->ar_cb (op->cls, &msg->identity, attr, NULL); |
619 | } | 619 | } |
620 | GNUNET_free (attr); | 620 | GNUNET_free (attr); |
621 | return; | 621 | return; |