diff options
Diffstat (limited to 'src/reclaim/gnunet-service-reclaim.c')
-rw-r--r-- | src/reclaim/gnunet-service-reclaim.c | 26 |
1 files changed, 13 insertions, 13 deletions
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 | ||