diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2020-05-05 10:27:56 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2020-05-05 10:27:56 +0200 |
commit | 067059ee3b632dcc0fe872de72c1964bca941742 (patch) | |
tree | c0feb23250fb389f0563044b27784b9f4625183d | |
parent | 80b88d6a6871ed8dcb24bcc8babdde3a17aad679 (diff) | |
download | gnunet-067059ee3b632dcc0fe872de72c1964bca941742.tar.gz gnunet-067059ee3b632dcc0fe872de72c1964bca941742.zip |
fix attestations
-rw-r--r-- | src/reclaim/oidc_helper.c | 1 | ||||
-rw-r--r-- | src/reclaim/plugin_rest_openid_connect.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c index 29e8cb2ef..5d04ef6b2 100644 --- a/src/reclaim/oidc_helper.c +++ b/src/reclaim/oidc_helper.c | |||
@@ -710,6 +710,7 @@ OIDC_parse_authz_code (const struct GNUNET_CRYPTO_EcdsaPrivateKey *ecdsa_priv, | |||
710 | attrs_ser = ((char *) ¶ms[1]) + code_challenge_len; | 710 | attrs_ser = ((char *) ¶ms[1]) + code_challenge_len; |
711 | attrs_ser_len = ntohl (params->attr_list_len); | 711 | attrs_ser_len = ntohl (params->attr_list_len); |
712 | *attrs = GNUNET_RECLAIM_attribute_list_deserialize (attrs_ser, attrs_ser_len); | 712 | *attrs = GNUNET_RECLAIM_attribute_list_deserialize (attrs_ser, attrs_ser_len); |
713 | *attests = GNUNET_new (struct GNUNET_RECLAIM_AttestationList); | ||
713 | 714 | ||
714 | *nonce_str = NULL; | 715 | *nonce_str = NULL; |
715 | if (nonce != 0) | 716 | if (nonce != 0) |
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c index 295de0d97..c6fa40687 100644 --- a/src/reclaim/plugin_rest_openid_connect.c +++ b/src/reclaim/plugin_rest_openid_connect.c | |||
@@ -549,6 +549,8 @@ cleanup_handle (struct RequestHandle *handle) | |||
549 | GNUNET_RECLAIM_get_attestations_stop (handle->attest_it); | 549 | GNUNET_RECLAIM_get_attestations_stop (handle->attest_it); |
550 | if (NULL != handle->ticket_it) | 550 | if (NULL != handle->ticket_it) |
551 | GNUNET_RECLAIM_ticket_iteration_stop (handle->ticket_it); | 551 | GNUNET_RECLAIM_ticket_iteration_stop (handle->ticket_it); |
552 | if (NULL != handle->idp_op) | ||
553 | GNUNET_RECLAIM_cancel (handle->idp_op); | ||
552 | if (NULL != handle->idp) | 554 | if (NULL != handle->idp) |
553 | GNUNET_RECLAIM_disconnect (handle->idp); | 555 | GNUNET_RECLAIM_disconnect (handle->idp); |
554 | GNUNET_free_non_null (handle->url); | 556 | GNUNET_free_non_null (handle->url); |
@@ -1784,8 +1786,8 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle, | |||
1784 | struct RequestHandle *handle = cls; | 1786 | struct RequestHandle *handle = cls; |
1785 | const struct EgoEntry *ego_entry; | 1787 | const struct EgoEntry *ego_entry; |
1786 | struct GNUNET_TIME_Relative expiration_time; | 1788 | struct GNUNET_TIME_Relative expiration_time; |
1787 | struct GNUNET_RECLAIM_AttributeList *cl; | 1789 | struct GNUNET_RECLAIM_AttributeList *cl = NULL; |
1788 | struct GNUNET_RECLAIM_AttestationList *al; | 1790 | struct GNUNET_RECLAIM_AttestationList *al = NULL; |
1789 | struct GNUNET_RECLAIM_Ticket ticket; | 1791 | struct GNUNET_RECLAIM_Ticket ticket; |
1790 | struct GNUNET_CRYPTO_EcdsaPublicKey cid; | 1792 | struct GNUNET_CRYPTO_EcdsaPublicKey cid; |
1791 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; | 1793 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey; |
@@ -1948,6 +1950,8 @@ consume_ticket (void *cls, | |||
1948 | const struct GNUNET_RECLAIM_Attestation *attest) | 1950 | const struct GNUNET_RECLAIM_Attestation *attest) |
1949 | { | 1951 | { |
1950 | struct RequestHandle *handle = cls; | 1952 | struct RequestHandle *handle = cls; |
1953 | handle->idp_op = NULL; | ||
1954 | |||
1951 | if (NULL == identity) | 1955 | if (NULL == identity) |
1952 | { | 1956 | { |
1953 | GNUNET_SCHEDULER_add_now (&return_userinfo_response, handle); | 1957 | GNUNET_SCHEDULER_add_now (&return_userinfo_response, handle); |