diff options
author | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2018-07-19 23:28:53 +0200 |
---|---|---|
committer | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2018-07-19 23:28:53 +0200 |
commit | 4fd677cec39e5621d16bc2c63926b803b31582e3 (patch) | |
tree | b1ed7c7544c1a8a721308d67c908e0f3cd758486 /src/include | |
parent | 0f75e5c54c6e6c9087cf565539266514abd67e98 (diff) | |
download | gnunet-4fd677cec39e5621d16bc2c63926b803b31582e3.tar.gz gnunet-4fd677cec39e5621d16bc2c63926b803b31582e3.zip |
renamed identity-provider subsystem to reclaim
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/Makefile.am | 2 | ||||
-rw-r--r-- | src/include/gnunet_protocols.h | 30 | ||||
-rw-r--r-- | src/include/gnunet_reclaim_attribute_lib.h (renamed from src/include/gnunet_identity_attribute_lib.h) | 64 | ||||
-rw-r--r-- | src/include/gnunet_reclaim_attribute_plugin.h (renamed from src/include/gnunet_identity_attribute_plugin.h) | 24 | ||||
-rw-r--r-- | src/include/gnunet_reclaim_plugin.h (renamed from src/include/gnunet_identity_provider_plugin.h) | 28 | ||||
-rw-r--r-- | src/include/gnunet_reclaim_service.h (renamed from src/include/gnunet_identity_provider_service.h) | 116 |
6 files changed, 132 insertions, 132 deletions
diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 08e9dd156..41b2b1382 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am | |||
@@ -66,7 +66,7 @@ gnunetinclude_HEADERS = \ | |||
66 | gnunet_hello_lib.h \ | 66 | gnunet_hello_lib.h \ |
67 | gnunet_helper_lib.h \ | 67 | gnunet_helper_lib.h \ |
68 | gnunet_identity_service.h \ | 68 | gnunet_identity_service.h \ |
69 | gnunet_identity_provider_service.h \ | 69 | gnunet_reclaim_service.h \ |
70 | gnunet_json_lib.h \ | 70 | gnunet_json_lib.h \ |
71 | gnunet_jsonapi_lib.h \ | 71 | gnunet_jsonapi_lib.h \ |
72 | gnunet_jsonapi_util.h \ | 72 | gnunet_jsonapi_util.h \ |
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 36aa424b4..4400db7e1 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -2656,35 +2656,35 @@ extern "C" | |||
2656 | * | 2656 | * |
2657 | * IDENTITY PROVIDER MESSAGE TYPES | 2657 | * IDENTITY PROVIDER MESSAGE TYPES |
2658 | */ | 2658 | */ |
2659 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE 961 | 2659 | #define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE 961 |
2660 | 2660 | ||
2661 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE_RESPONSE 962 | 2661 | #define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE_RESPONSE 962 |
2662 | 2662 | ||
2663 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_START 963 | 2663 | #define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_START 963 |
2664 | 2664 | ||
2665 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_STOP 964 | 2665 | #define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP 964 |
2666 | 2666 | ||
2667 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_NEXT 965 | 2667 | #define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT 965 |
2668 | 2668 | ||
2669 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT 966 | 2669 | #define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT 966 |
2670 | 2670 | ||
2671 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_TICKET 967 | 2671 | #define GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET 967 |
2672 | 2672 | ||
2673 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT 968 | 2673 | #define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT 968 |
2674 | 2674 | ||
2675 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET 969 | 2675 | #define GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET 969 |
2676 | 2676 | ||
2677 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET_RESULT 970 | 2677 | #define GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT 970 |
2678 | 2678 | ||
2679 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET 971 | 2679 | #define GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET 971 |
2680 | 2680 | ||
2681 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET_RESULT 972 | 2681 | #define GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT 972 |
2682 | 2682 | ||
2683 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_START 973 | 2683 | #define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_START 973 |
2684 | 2684 | ||
2685 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_STOP 974 | 2685 | #define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP 974 |
2686 | 2686 | ||
2687 | #define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_NEXT 975 | 2687 | #define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT 975 |
2688 | 2688 | ||
2689 | /************************************************** | 2689 | /************************************************** |
2690 | * | 2690 | * |
diff --git a/src/include/gnunet_identity_attribute_lib.h b/src/include/gnunet_reclaim_attribute_lib.h index eb01f7ac2..df5356d76 100644 --- a/src/include/gnunet_identity_attribute_lib.h +++ b/src/include/gnunet_reclaim_attribute_lib.h | |||
@@ -25,8 +25,8 @@ | |||
25 | * @defgroup identity-provider Identity Provider service | 25 | * @defgroup identity-provider Identity Provider service |
26 | * @{ | 26 | * @{ |
27 | */ | 27 | */ |
28 | #ifndef GNUNET_IDENTITY_ATTRIBUTE_LIB_H | 28 | #ifndef GNUNET_RECLAIM_ATTRIBUTE_LIB_H |
29 | #define GNUNET_IDENTITY_ATTRIBUTE_LIB_H | 29 | #define GNUNET_RECLAIM_ATTRIBUTE_LIB_H |
30 | 30 | ||
31 | #ifdef __cplusplus | 31 | #ifdef __cplusplus |
32 | extern "C" | 32 | extern "C" |
@@ -42,19 +42,19 @@ extern "C" | |||
42 | /** | 42 | /** |
43 | * No value attribute. | 43 | * No value attribute. |
44 | */ | 44 | */ |
45 | #define GNUNET_IDENTITY_ATTRIBUTE_TYPE_NONE 0 | 45 | #define GNUNET_RECLAIM_ATTRIBUTE_TYPE_NONE 0 |
46 | 46 | ||
47 | /** | 47 | /** |
48 | * String attribute. | 48 | * String attribute. |
49 | */ | 49 | */ |
50 | #define GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING 1 | 50 | #define GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING 1 |
51 | 51 | ||
52 | 52 | ||
53 | 53 | ||
54 | /** | 54 | /** |
55 | * An attribute. | 55 | * An attribute. |
56 | */ | 56 | */ |
57 | struct GNUNET_IDENTITY_ATTRIBUTE_Claim | 57 | struct GNUNET_RECLAIM_ATTRIBUTE_Claim |
58 | { | 58 | { |
59 | /** | 59 | /** |
60 | * The name of the attribute. Note "name" must never be individually | 60 | * The name of the attribute. Note "name" must never be individually |
@@ -86,35 +86,35 @@ struct GNUNET_IDENTITY_ATTRIBUTE_Claim | |||
86 | 86 | ||
87 | }; | 87 | }; |
88 | 88 | ||
89 | struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList | 89 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList |
90 | { | 90 | { |
91 | /** | 91 | /** |
92 | * List head | 92 | * List head |
93 | */ | 93 | */ |
94 | struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *list_head; | 94 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *list_head; |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * List tail | 97 | * List tail |
98 | */ | 98 | */ |
99 | struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *list_tail; | 99 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *list_tail; |
100 | }; | 100 | }; |
101 | 101 | ||
102 | struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry | 102 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry |
103 | { | 103 | { |
104 | /** | 104 | /** |
105 | * DLL | 105 | * DLL |
106 | */ | 106 | */ |
107 | struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *prev; | 107 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *prev; |
108 | 108 | ||
109 | /** | 109 | /** |
110 | * DLL | 110 | * DLL |
111 | */ | 111 | */ |
112 | struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *next; | 112 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *next; |
113 | 113 | ||
114 | /** | 114 | /** |
115 | * The attribute claim | 115 | * The attribute claim |
116 | */ | 116 | */ |
117 | struct GNUNET_IDENTITY_ATTRIBUTE_Claim *claim; | 117 | struct GNUNET_RECLAIM_ATTRIBUTE_Claim *claim; |
118 | }; | 118 | }; |
119 | 119 | ||
120 | /** | 120 | /** |
@@ -126,8 +126,8 @@ struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry | |||
126 | * @param data_size the attribute value size | 126 | * @param data_size the attribute value size |
127 | * @return the new attribute | 127 | * @return the new attribute |
128 | */ | 128 | */ |
129 | struct GNUNET_IDENTITY_ATTRIBUTE_Claim * | 129 | struct GNUNET_RECLAIM_ATTRIBUTE_Claim * |
130 | GNUNET_IDENTITY_ATTRIBUTE_claim_new (const char* attr_name, | 130 | GNUNET_RECLAIM_ATTRIBUTE_claim_new (const char* attr_name, |
131 | uint32_t type, | 131 | uint32_t type, |
132 | const void* data, | 132 | const void* data, |
133 | size_t data_size); | 133 | size_t data_size); |
@@ -141,13 +141,13 @@ GNUNET_IDENTITY_ATTRIBUTE_claim_new (const char* attr_name, | |||
141 | * @return the required buffer size | 141 | * @return the required buffer size |
142 | */ | 142 | */ |
143 | size_t | 143 | size_t |
144 | GNUNET_IDENTITY_ATTRIBUTE_list_serialize_get_size (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); | 144 | GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); |
145 | 145 | ||
146 | void | 146 | void |
147 | GNUNET_IDENTITY_ATTRIBUTE_list_destroy (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); | 147 | GNUNET_RECLAIM_ATTRIBUTE_list_destroy (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); |
148 | 148 | ||
149 | void | 149 | void |
150 | GNUNET_IDENTITY_ATTRIBUTE_list_add (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, | 150 | GNUNET_RECLAIM_ATTRIBUTE_list_add (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, |
151 | const char* attr_name, | 151 | const char* attr_name, |
152 | uint32_t type, | 152 | uint32_t type, |
153 | const void* data, | 153 | const void* data, |
@@ -162,7 +162,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_add (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList * | |||
162 | * @return length of serialized data | 162 | * @return length of serialized data |
163 | */ | 163 | */ |
164 | size_t | 164 | size_t |
165 | GNUNET_IDENTITY_ATTRIBUTE_list_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, | 165 | GNUNET_RECLAIM_ATTRIBUTE_list_serialize (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, |
166 | char *result); | 166 | char *result); |
167 | 167 | ||
168 | /** | 168 | /** |
@@ -173,8 +173,8 @@ GNUNET_IDENTITY_ATTRIBUTE_list_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE | |||
173 | * | 173 | * |
174 | * @return a GNUNET_IDENTITY_PROVIDER_AttributeList, must be free'd by caller | 174 | * @return a GNUNET_IDENTITY_PROVIDER_AttributeList, must be free'd by caller |
175 | */ | 175 | */ |
176 | struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList * | 176 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList * |
177 | GNUNET_IDENTITY_ATTRIBUTE_list_deserialize (const char* data, | 177 | GNUNET_RECLAIM_ATTRIBUTE_list_deserialize (const char* data, |
178 | size_t data_size); | 178 | size_t data_size); |
179 | 179 | ||
180 | 180 | ||
@@ -186,7 +186,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_deserialize (const char* data, | |||
186 | * @return the required buffer size | 186 | * @return the required buffer size |
187 | */ | 187 | */ |
188 | size_t | 188 | size_t |
189 | GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr); | 189 | GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr); |
190 | 190 | ||
191 | 191 | ||
192 | 192 | ||
@@ -199,7 +199,7 @@ GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (const struct GNUNET_IDENTITY_ATTRI | |||
199 | * @return length of serialized data | 199 | * @return length of serialized data |
200 | */ | 200 | */ |
201 | size_t | 201 | size_t |
202 | GNUNET_IDENTITY_ATTRIBUTE_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr, | 202 | GNUNET_RECLAIM_ATTRIBUTE_serialize (const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, |
203 | char *result); | 203 | char *result); |
204 | 204 | ||
205 | /** | 205 | /** |
@@ -210,12 +210,12 @@ GNUNET_IDENTITY_ATTRIBUTE_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_Clai | |||
210 | * | 210 | * |
211 | * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller | 211 | * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller |
212 | */ | 212 | */ |
213 | struct GNUNET_IDENTITY_ATTRIBUTE_Claim * | 213 | struct GNUNET_RECLAIM_ATTRIBUTE_Claim * |
214 | GNUNET_IDENTITY_ATTRIBUTE_deserialize (const char* data, | 214 | GNUNET_RECLAIM_ATTRIBUTE_deserialize (const char* data, |
215 | size_t data_size); | 215 | size_t data_size); |
216 | 216 | ||
217 | struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList* | 217 | struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList* |
218 | GNUNET_IDENTITY_ATTRIBUTE_list_dup (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); | 218 | GNUNET_RECLAIM_ATTRIBUTE_list_dup (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); |
219 | 219 | ||
220 | /** | 220 | /** |
221 | * Convert a type name to the corresponding number | 221 | * Convert a type name to the corresponding number |
@@ -224,7 +224,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_dup (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim | |||
224 | * @return corresponding number, UINT32_MAX on error | 224 | * @return corresponding number, UINT32_MAX on error |
225 | */ | 225 | */ |
226 | uint32_t | 226 | uint32_t |
227 | GNUNET_IDENTITY_ATTRIBUTE_typename_to_number (const char *typename); | 227 | GNUNET_RECLAIM_ATTRIBUTE_typename_to_number (const char *typename); |
228 | 228 | ||
229 | /** | 229 | /** |
230 | * Convert human-readable version of a 'claim' of an attribute to the binary | 230 | * Convert human-readable version of a 'claim' of an attribute to the binary |
@@ -237,7 +237,7 @@ GNUNET_IDENTITY_ATTRIBUTE_typename_to_number (const char *typename); | |||
237 | * @return #GNUNET_OK on success | 237 | * @return #GNUNET_OK on success |
238 | */ | 238 | */ |
239 | int | 239 | int |
240 | GNUNET_IDENTITY_ATTRIBUTE_string_to_value (uint32_t type, | 240 | GNUNET_RECLAIM_ATTRIBUTE_string_to_value (uint32_t type, |
241 | const char *s, | 241 | const char *s, |
242 | void **data, | 242 | void **data, |
243 | size_t *data_size); | 243 | size_t *data_size); |
@@ -251,7 +251,7 @@ GNUNET_IDENTITY_ATTRIBUTE_string_to_value (uint32_t type, | |||
251 | * @return NULL on error, otherwise human-readable representation of the claim | 251 | * @return NULL on error, otherwise human-readable representation of the claim |
252 | */ | 252 | */ |
253 | char * | 253 | char * |
254 | GNUNET_IDENTITY_ATTRIBUTE_value_to_string (uint32_t type, | 254 | GNUNET_RECLAIM_ATTRIBUTE_value_to_string (uint32_t type, |
255 | const void* data, | 255 | const void* data, |
256 | size_t data_size); | 256 | size_t data_size); |
257 | 257 | ||
@@ -262,7 +262,7 @@ GNUNET_IDENTITY_ATTRIBUTE_value_to_string (uint32_t type, | |||
262 | * @return corresponding typestring, NULL on error | 262 | * @return corresponding typestring, NULL on error |
263 | */ | 263 | */ |
264 | const char* | 264 | const char* |
265 | GNUNET_IDENTITY_ATTRIBUTE_number_to_typename (uint32_t type); | 265 | GNUNET_RECLAIM_ATTRIBUTE_number_to_typename (uint32_t type); |
266 | 266 | ||
267 | 267 | ||
268 | #if 0 /* keep Emacsens' auto-indent happy */ | 268 | #if 0 /* keep Emacsens' auto-indent happy */ |
@@ -273,9 +273,9 @@ GNUNET_IDENTITY_ATTRIBUTE_number_to_typename (uint32_t type); | |||
273 | #endif | 273 | #endif |
274 | 274 | ||
275 | 275 | ||
276 | /* ifndef GNUNET_IDENTITY_ATTRIBUTE_LIB_H */ | 276 | /* ifndef GNUNET_RECLAIM_ATTRIBUTE_LIB_H */ |
277 | #endif | 277 | #endif |
278 | 278 | ||
279 | /** @} */ /* end of group identity */ | 279 | /** @} */ /* end of group identity */ |
280 | 280 | ||
281 | /* end of gnunet_identity_attribute_lib.h */ | 281 | /* end of gnunet_reclaim_attribute_lib.h */ |
diff --git a/src/include/gnunet_identity_attribute_plugin.h b/src/include/gnunet_reclaim_attribute_plugin.h index 7c399c616..cf0bb141a 100644 --- a/src/include/gnunet_identity_attribute_plugin.h +++ b/src/include/gnunet_reclaim_attribute_plugin.h | |||
@@ -26,11 +26,11 @@ | |||
26 | * Plugin API for the idp database backend | 26 | * Plugin API for the idp database backend |
27 | * @{ | 27 | * @{ |
28 | */ | 28 | */ |
29 | #ifndef GNUNET_IDENTITY_ATTRIBUTE_PLUGIN_H | 29 | #ifndef GNUNET_RECLAIM_ATTRIBUTE_PLUGIN_H |
30 | #define GNUNET_IDENTITY_ATTRIBUTE_PLUGIN_H | 30 | #define GNUNET_RECLAIM_ATTRIBUTE_PLUGIN_H |
31 | 31 | ||
32 | #include "gnunet_util_lib.h" | 32 | #include "gnunet_util_lib.h" |
33 | #include "gnunet_identity_attribute_lib.h" | 33 | #include "gnunet_reclaim_attribute_lib.h" |
34 | 34 | ||
35 | #ifdef __cplusplus | 35 | #ifdef __cplusplus |
36 | extern "C" | 36 | extern "C" |
@@ -51,7 +51,7 @@ extern "C" | |||
51 | * @param data_size number of bytes in @a data | 51 | * @param data_size number of bytes in @a data |
52 | * @return NULL on error, otherwise human-readable representation of the value | 52 | * @return NULL on error, otherwise human-readable representation of the value |
53 | */ | 53 | */ |
54 | typedef char * (*GNUNET_IDENTITY_ATTRIBUTE_ValueToStringFunction) (void *cls, | 54 | typedef char * (*GNUNET_RECLAIM_ATTRIBUTE_ValueToStringFunction) (void *cls, |
55 | uint32_t type, | 55 | uint32_t type, |
56 | const void *data, | 56 | const void *data, |
57 | size_t data_size); | 57 | size_t data_size); |
@@ -69,7 +69,7 @@ typedef char * (*GNUNET_IDENTITY_ATTRIBUTE_ValueToStringFunction) (void *cls, | |||
69 | * @param data_size set to number of bytes in @a data | 69 | * @param data_size set to number of bytes in @a data |
70 | * @return #GNUNET_OK on success | 70 | * @return #GNUNET_OK on success |
71 | */ | 71 | */ |
72 | typedef int (*GNUNET_IDENTITY_ATTRIBUTE_StringToValueFunction) (void *cls, | 72 | typedef int (*GNUNET_RECLAIM_ATTRIBUTE_StringToValueFunction) (void *cls, |
73 | uint32_t type, | 73 | uint32_t type, |
74 | const char *s, | 74 | const char *s, |
75 | void **data, | 75 | void **data, |
@@ -84,7 +84,7 @@ typedef int (*GNUNET_IDENTITY_ATTRIBUTE_StringToValueFunction) (void *cls, | |||
84 | * @param typename name to convert | 84 | * @param typename name to convert |
85 | * @return corresponding number, UINT32_MAX on error | 85 | * @return corresponding number, UINT32_MAX on error |
86 | */ | 86 | */ |
87 | typedef uint32_t (*GNUNET_IDENTITY_ATTRIBUTE_TypenameToNumberFunction) (void *cls, | 87 | typedef uint32_t (*GNUNET_RECLAIM_ATTRIBUTE_TypenameToNumberFunction) (void *cls, |
88 | const char *typename); | 88 | const char *typename); |
89 | 89 | ||
90 | 90 | ||
@@ -96,7 +96,7 @@ typedef uint32_t (*GNUNET_IDENTITY_ATTRIBUTE_TypenameToNumberFunction) (void *cl | |||
96 | * @param type number of a type to convert | 96 | * @param type number of a type to convert |
97 | * @return corresponding typestring, NULL on error | 97 | * @return corresponding typestring, NULL on error |
98 | */ | 98 | */ |
99 | typedef const char * (*GNUNET_IDENTITY_ATTRIBUTE_NumberToTypenameFunction) (void *cls, | 99 | typedef const char * (*GNUNET_RECLAIM_ATTRIBUTE_NumberToTypenameFunction) (void *cls, |
100 | uint32_t type); | 100 | uint32_t type); |
101 | 101 | ||
102 | 102 | ||
@@ -104,7 +104,7 @@ typedef const char * (*GNUNET_IDENTITY_ATTRIBUTE_NumberToTypenameFunction) (void | |||
104 | * Each plugin is required to return a pointer to a struct of this | 104 | * Each plugin is required to return a pointer to a struct of this |
105 | * type as the return value from its entry point. | 105 | * type as the return value from its entry point. |
106 | */ | 106 | */ |
107 | struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions | 107 | struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions |
108 | { | 108 | { |
109 | 109 | ||
110 | /** | 110 | /** |
@@ -115,22 +115,22 @@ struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions | |||
115 | /** | 115 | /** |
116 | * Conversion to string. | 116 | * Conversion to string. |
117 | */ | 117 | */ |
118 | GNUNET_IDENTITY_ATTRIBUTE_ValueToStringFunction value_to_string; | 118 | GNUNET_RECLAIM_ATTRIBUTE_ValueToStringFunction value_to_string; |
119 | 119 | ||
120 | /** | 120 | /** |
121 | * Conversion to binary. | 121 | * Conversion to binary. |
122 | */ | 122 | */ |
123 | GNUNET_IDENTITY_ATTRIBUTE_StringToValueFunction string_to_value; | 123 | GNUNET_RECLAIM_ATTRIBUTE_StringToValueFunction string_to_value; |
124 | 124 | ||
125 | /** | 125 | /** |
126 | * Typename to number. | 126 | * Typename to number. |
127 | */ | 127 | */ |
128 | GNUNET_IDENTITY_ATTRIBUTE_TypenameToNumberFunction typename_to_number; | 128 | GNUNET_RECLAIM_ATTRIBUTE_TypenameToNumberFunction typename_to_number; |
129 | 129 | ||
130 | /** | 130 | /** |
131 | * Number to typename. | 131 | * Number to typename. |
132 | */ | 132 | */ |
133 | GNUNET_IDENTITY_ATTRIBUTE_NumberToTypenameFunction number_to_typename; | 133 | GNUNET_RECLAIM_ATTRIBUTE_NumberToTypenameFunction number_to_typename; |
134 | 134 | ||
135 | }; | 135 | }; |
136 | 136 | ||
diff --git a/src/include/gnunet_identity_provider_plugin.h b/src/include/gnunet_reclaim_plugin.h index 2330066dd..c400af64c 100644 --- a/src/include/gnunet_identity_provider_plugin.h +++ b/src/include/gnunet_reclaim_plugin.h | |||
@@ -22,15 +22,15 @@ | |||
22 | * @file | 22 | * @file |
23 | * Plugin API for the idp database backend | 23 | * Plugin API for the idp database backend |
24 | * | 24 | * |
25 | * @defgroup identity-provider-plugin IdP service plugin API | 25 | * @defgroup reclaim-plugin IdP service plugin API |
26 | * Plugin API for the idp database backend | 26 | * Plugin API for the idp database backend |
27 | * @{ | 27 | * @{ |
28 | */ | 28 | */ |
29 | #ifndef GNUNET_IDENTITY_PROVIDER_PLUGIN_H | 29 | #ifndef GNUNET_RECLAIM_PLUGIN_H |
30 | #define GNUNET_IDENTITY_PROVIDER_PLUGIN_H | 30 | #define GNUNET_RECLAIM_PLUGIN_H |
31 | 31 | ||
32 | #include "gnunet_util_lib.h" | 32 | #include "gnunet_util_lib.h" |
33 | #include "gnunet_identity_provider_service.h" | 33 | #include "gnunet_reclaim_service.h" |
34 | 34 | ||
35 | #ifdef __cplusplus | 35 | #ifdef __cplusplus |
36 | extern "C" | 36 | extern "C" |
@@ -47,15 +47,15 @@ extern "C" | |||
47 | * @param cls closure | 47 | * @param cls closure |
48 | * @param ticket the ticket | 48 | * @param ticket the ticket |
49 | */ | 49 | */ |
50 | typedef void (*GNUNET_IDENTITY_PROVIDER_TicketIterator) (void *cls, | 50 | typedef void (*GNUNET_RECLAIM_TicketIterator) (void *cls, |
51 | const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, | 51 | const struct GNUNET_RECLAIM_Ticket *ticket, |
52 | const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); | 52 | const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); |
53 | 53 | ||
54 | 54 | ||
55 | /** | 55 | /** |
56 | * @brief struct returned by the initialization function of the plugin | 56 | * @brief struct returned by the initialization function of the plugin |
57 | */ | 57 | */ |
58 | struct GNUNET_IDENTITY_PROVIDER_PluginFunctions | 58 | struct GNUNET_RECLAIM_PluginFunctions |
59 | { | 59 | { |
60 | 60 | ||
61 | /** | 61 | /** |
@@ -71,8 +71,8 @@ struct GNUNET_IDENTITY_PROVIDER_PluginFunctions | |||
71 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 71 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
72 | */ | 72 | */ |
73 | int (*store_ticket) (void *cls, | 73 | int (*store_ticket) (void *cls, |
74 | const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, | 74 | const struct GNUNET_RECLAIM_Ticket *ticket, |
75 | const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); | 75 | const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); |
76 | 76 | ||
77 | /** | 77 | /** |
78 | * Delete a ticket from the database. | 78 | * Delete a ticket from the database. |
@@ -82,7 +82,7 @@ struct GNUNET_IDENTITY_PROVIDER_PluginFunctions | |||
82 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 82 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
83 | */ | 83 | */ |
84 | int (*delete_ticket) (void *cls, | 84 | int (*delete_ticket) (void *cls, |
85 | const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket); | 85 | const struct GNUNET_RECLAIM_Ticket *ticket); |
86 | 86 | ||
87 | 87 | ||
88 | 88 | ||
@@ -101,11 +101,11 @@ struct GNUNET_IDENTITY_PROVIDER_PluginFunctions | |||
101 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 101 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
102 | int audience, | 102 | int audience, |
103 | uint64_t offset, | 103 | uint64_t offset, |
104 | GNUNET_IDENTITY_PROVIDER_TicketIterator iter, void *iter_cls); | 104 | GNUNET_RECLAIM_TicketIterator iter, void *iter_cls); |
105 | 105 | ||
106 | int (*get_ticket_attributes) (void* cls, | 106 | int (*get_ticket_attributes) (void* cls, |
107 | const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, | 107 | const struct GNUNET_RECLAIM_Ticket *ticket, |
108 | GNUNET_IDENTITY_PROVIDER_TicketIterator iter, | 108 | GNUNET_RECLAIM_TicketIterator iter, |
109 | void *iter_cls); | 109 | void *iter_cls); |
110 | }; | 110 | }; |
111 | 111 | ||
diff --git a/src/include/gnunet_identity_provider_service.h b/src/include/gnunet_reclaim_service.h index 0c72556e8..7e668cd62 100644 --- a/src/include/gnunet_identity_provider_service.h +++ b/src/include/gnunet_reclaim_service.h | |||
@@ -22,11 +22,11 @@ | |||
22 | * @file | 22 | * @file |
23 | * Identity provider service; implements identity provider for GNUnet | 23 | * Identity provider service; implements identity provider for GNUnet |
24 | * | 24 | * |
25 | * @defgroup identity-provider Identity Provider service | 25 | * @defgroup reclaim Identity Provider service |
26 | * @{ | 26 | * @{ |
27 | */ | 27 | */ |
28 | #ifndef GNUNET_IDENTITY_PROVIDER_SERVICE_H | 28 | #ifndef GNUNET_RECLAIM_SERVICE_H |
29 | #define GNUNET_IDENTITY_PROVIDER_SERVICE_H | 29 | #define GNUNET_RECLAIM_SERVICE_H |
30 | 30 | ||
31 | #ifdef __cplusplus | 31 | #ifdef __cplusplus |
32 | extern "C" | 32 | extern "C" |
@@ -37,27 +37,27 @@ extern "C" | |||
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #include "gnunet_util_lib.h" | 39 | #include "gnunet_util_lib.h" |
40 | #include "gnunet_identity_attribute_lib.h" | 40 | #include "gnunet_reclaim_attribute_lib.h" |
41 | 41 | ||
42 | /** | 42 | /** |
43 | * Version number of GNUnet Identity Provider API. | 43 | * Version number of GNUnet Identity Provider API. |
44 | */ | 44 | */ |
45 | #define GNUNET_IDENTITY_PROVIDER_VERSION 0x00000000 | 45 | #define GNUNET_RECLAIM_VERSION 0x00000000 |
46 | 46 | ||
47 | /** | 47 | /** |
48 | * Handle to access the identity service. | 48 | * Handle to access the identity service. |
49 | */ | 49 | */ |
50 | struct GNUNET_IDENTITY_PROVIDER_Handle; | 50 | struct GNUNET_RECLAIM_Handle; |
51 | 51 | ||
52 | /** | 52 | /** |
53 | * Handle for a token. | 53 | * Handle for a token. |
54 | */ | 54 | */ |
55 | struct GNUNET_IDENTITY_PROVIDER_Token; | 55 | struct GNUNET_RECLAIM_Token; |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * The ticket | 58 | * The ticket |
59 | */ | 59 | */ |
60 | struct GNUNET_IDENTITY_PROVIDER_Ticket | 60 | struct GNUNET_RECLAIM_Ticket |
61 | { | 61 | { |
62 | /** | 62 | /** |
63 | * The ticket issuer | 63 | * The ticket issuer |
@@ -78,7 +78,7 @@ struct GNUNET_IDENTITY_PROVIDER_Ticket | |||
78 | /** | 78 | /** |
79 | * Handle for an operation with the identity provider service. | 79 | * Handle for an operation with the identity provider service. |
80 | */ | 80 | */ |
81 | struct GNUNET_IDENTITY_PROVIDER_Operation; | 81 | struct GNUNET_RECLAIM_Operation; |
82 | 82 | ||
83 | 83 | ||
84 | /** | 84 | /** |
@@ -87,8 +87,8 @@ struct GNUNET_IDENTITY_PROVIDER_Operation; | |||
87 | * @param cfg Configuration to contact the identity provider service. | 87 | * @param cfg Configuration to contact the identity provider service. |
88 | * @return handle to communicate with identity provider service | 88 | * @return handle to communicate with identity provider service |
89 | */ | 89 | */ |
90 | struct GNUNET_IDENTITY_PROVIDER_Handle * | 90 | struct GNUNET_RECLAIM_Handle * |
91 | GNUNET_IDENTITY_PROVIDER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); | 91 | GNUNET_RECLAIM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); |
92 | 92 | ||
93 | /** | 93 | /** |
94 | * Continuation called to notify client about result of the | 94 | * Continuation called to notify client about result of the |
@@ -101,7 +101,7 @@ GNUNET_IDENTITY_PROVIDER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
101 | * @param emsg NULL on success, otherwise an error message | 101 | * @param emsg NULL on success, otherwise an error message |
102 | */ | 102 | */ |
103 | typedef void | 103 | typedef void |
104 | (*GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus) (void *cls, | 104 | (*GNUNET_RECLAIM_ContinuationWithStatus) (void *cls, |
105 | int32_t success, | 105 | int32_t success, |
106 | const char *emsg); | 106 | const char *emsg); |
107 | 107 | ||
@@ -118,12 +118,12 @@ typedef void | |||
118 | * @param cont_cls closure for @a cont | 118 | * @param cont_cls closure for @a cont |
119 | * @return handle to abort the request | 119 | * @return handle to abort the request |
120 | */ | 120 | */ |
121 | struct GNUNET_IDENTITY_PROVIDER_Operation * | 121 | struct GNUNET_RECLAIM_Operation * |
122 | GNUNET_IDENTITY_PROVIDER_attribute_store (struct GNUNET_IDENTITY_PROVIDER_Handle *h, | 122 | GNUNET_RECLAIM_attribute_store (struct GNUNET_RECLAIM_Handle *h, |
123 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, | 123 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, |
124 | const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr, | 124 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, |
125 | const struct GNUNET_TIME_Relative *exp_interval, | 125 | const struct GNUNET_TIME_Relative *exp_interval, |
126 | GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus cont, | 126 | GNUNET_RECLAIM_ContinuationWithStatus cont, |
127 | void *cont_cls); | 127 | void *cont_cls); |
128 | 128 | ||
129 | 129 | ||
@@ -135,19 +135,19 @@ GNUNET_IDENTITY_PROVIDER_attribute_store (struct GNUNET_IDENTITY_PROVIDER_Handle | |||
135 | * @param attr the attribute | 135 | * @param attr the attribute |
136 | */ | 136 | */ |
137 | typedef void | 137 | typedef void |
138 | (*GNUNET_IDENTITY_PROVIDER_AttributeResult) (void *cls, | 138 | (*GNUNET_RECLAIM_AttributeResult) (void *cls, |
139 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 139 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
140 | const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr); | 140 | const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr); |
141 | 141 | ||
142 | 142 | ||
143 | 143 | ||
144 | /** | 144 | /** |
145 | * List all attributes for a local identity. | 145 | * List all attributes for a local identity. |
146 | * This MUST lock the `struct GNUNET_IDENTITY_PROVIDER_Handle` | 146 | * This MUST lock the `struct GNUNET_RECLAIM_Handle` |
147 | * for any other calls than #GNUNET_IDENTITY_PROVIDER_get_attributes_next() and | 147 | * for any other calls than #GNUNET_RECLAIM_get_attributes_next() and |
148 | * #GNUNET_IDENTITY_PROVIDER_get_attributes_stop. @a proc will be called once | 148 | * #GNUNET_RECLAIM_get_attributes_stop. @a proc will be called once |
149 | * immediately, and then again after | 149 | * immediately, and then again after |
150 | * #GNUNET_IDENTITY_PROVIDER_get_attributes_next() is invoked. | 150 | * #GNUNET_RECLAIM_get_attributes_next() is invoked. |
151 | * | 151 | * |
152 | * On error (disconnect), @a error_cb will be invoked. | 152 | * On error (disconnect), @a error_cb will be invoked. |
153 | * On normal completion, @a finish_cb proc will be | 153 | * On normal completion, @a finish_cb proc will be |
@@ -166,36 +166,36 @@ typedef void | |||
166 | * @param finish_cb_cls closure for @a finish_cb | 166 | * @param finish_cb_cls closure for @a finish_cb |
167 | * @return an iterator handle to use for iteration | 167 | * @return an iterator handle to use for iteration |
168 | */ | 168 | */ |
169 | struct GNUNET_IDENTITY_PROVIDER_AttributeIterator * | 169 | struct GNUNET_RECLAIM_AttributeIterator * |
170 | GNUNET_IDENTITY_PROVIDER_get_attributes_start (struct GNUNET_IDENTITY_PROVIDER_Handle *h, | 170 | GNUNET_RECLAIM_get_attributes_start (struct GNUNET_RECLAIM_Handle *h, |
171 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 171 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, |
172 | GNUNET_SCHEDULER_TaskCallback error_cb, | 172 | GNUNET_SCHEDULER_TaskCallback error_cb, |
173 | void *error_cb_cls, | 173 | void *error_cb_cls, |
174 | GNUNET_IDENTITY_PROVIDER_AttributeResult proc, | 174 | GNUNET_RECLAIM_AttributeResult proc, |
175 | void *proc_cls, | 175 | void *proc_cls, |
176 | GNUNET_SCHEDULER_TaskCallback finish_cb, | 176 | GNUNET_SCHEDULER_TaskCallback finish_cb, |
177 | void *finish_cb_cls); | 177 | void *finish_cb_cls); |
178 | 178 | ||
179 | 179 | ||
180 | /** | 180 | /** |
181 | * Calls the record processor specified in #GNUNET_IDENTITY_PROVIDER_get_attributes_start | 181 | * Calls the record processor specified in #GNUNET_RECLAIM_get_attributes_start |
182 | * for the next record. | 182 | * for the next record. |
183 | * | 183 | * |
184 | * @param it the iterator | 184 | * @param it the iterator |
185 | */ | 185 | */ |
186 | void | 186 | void |
187 | GNUNET_IDENTITY_PROVIDER_get_attributes_next (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it); | 187 | GNUNET_RECLAIM_get_attributes_next (struct GNUNET_RECLAIM_AttributeIterator *it); |
188 | 188 | ||
189 | 189 | ||
190 | /** | 190 | /** |
191 | * Stops iteration and releases the idp handle for further calls. Must | 191 | * Stops iteration and releases the idp handle for further calls. Must |
192 | * be called on any iteration that has not yet completed prior to calling | 192 | * be called on any iteration that has not yet completed prior to calling |
193 | * #GNUNET_IDENTITY_PROVIDER_disconnect. | 193 | * #GNUNET_RECLAIM_disconnect. |
194 | * | 194 | * |
195 | * @param it the iterator | 195 | * @param it the iterator |
196 | */ | 196 | */ |
197 | void | 197 | void |
198 | GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it); | 198 | GNUNET_RECLAIM_get_attributes_stop (struct GNUNET_RECLAIM_AttributeIterator *it); |
199 | 199 | ||
200 | 200 | ||
201 | /** | 201 | /** |
@@ -207,12 +207,12 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_At | |||
207 | * @param ticket the ticket | 207 | * @param ticket the ticket |
208 | */ | 208 | */ |
209 | typedef void | 209 | typedef void |
210 | (*GNUNET_IDENTITY_PROVIDER_TicketCallback)(void *cls, | 210 | (*GNUNET_RECLAIM_TicketCallback)(void *cls, |
211 | const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket); | 211 | const struct GNUNET_RECLAIM_Ticket *ticket); |
212 | 212 | ||
213 | /** | 213 | /** |
214 | * Issues a ticket to another identity. The identity may use | 214 | * Issues a ticket to another identity. The identity may use |
215 | * GNUNET_IDENTITY_PROVIDER_ticket_consume to consume the ticket | 215 | * GNUNET_RECLAIM_ticket_consume to consume the ticket |
216 | * and retrieve the attributes specified in the AttributeList. | 216 | * and retrieve the attributes specified in the AttributeList. |
217 | * | 217 | * |
218 | * @param h the identity provider to use | 218 | * @param h the identity provider to use |
@@ -223,12 +223,12 @@ typedef void | |||
223 | * @param cb_cls the callback closure | 223 | * @param cb_cls the callback closure |
224 | * @return handle to abort the operation | 224 | * @return handle to abort the operation |
225 | */ | 225 | */ |
226 | struct GNUNET_IDENTITY_PROVIDER_Operation * | 226 | struct GNUNET_RECLAIM_Operation * |
227 | GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h, | 227 | GNUNET_RECLAIM_ticket_issue (struct GNUNET_RECLAIM_Handle *h, |
228 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss, | 228 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss, |
229 | const struct GNUNET_CRYPTO_EcdsaPublicKey *rp, | 229 | const struct GNUNET_CRYPTO_EcdsaPublicKey *rp, |
230 | const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, | 230 | const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, |
231 | GNUNET_IDENTITY_PROVIDER_TicketCallback cb, | 231 | GNUNET_RECLAIM_TicketCallback cb, |
232 | void *cb_cls); | 232 | void *cb_cls); |
233 | 233 | ||
234 | /** | 234 | /** |
@@ -242,11 +242,11 @@ GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h | |||
242 | * @param cb_cls the callback closure | 242 | * @param cb_cls the callback closure |
243 | * @return handle to abort the operation | 243 | * @return handle to abort the operation |
244 | */ | 244 | */ |
245 | struct GNUNET_IDENTITY_PROVIDER_Operation * | 245 | struct GNUNET_RECLAIM_Operation * |
246 | GNUNET_IDENTITY_PROVIDER_ticket_revoke (struct GNUNET_IDENTITY_PROVIDER_Handle *h, | 246 | GNUNET_RECLAIM_ticket_revoke (struct GNUNET_RECLAIM_Handle *h, |
247 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 247 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, |
248 | const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, | 248 | const struct GNUNET_RECLAIM_Ticket *ticket, |
249 | GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus cb, | 249 | GNUNET_RECLAIM_ContinuationWithStatus cb, |
250 | void *cb_cls); | 250 | void *cb_cls); |
251 | 251 | ||
252 | 252 | ||
@@ -262,11 +262,11 @@ GNUNET_IDENTITY_PROVIDER_ticket_revoke (struct GNUNET_IDENTITY_PROVIDER_Handle * | |||
262 | * @param cb_cls the callback closure | 262 | * @param cb_cls the callback closure |
263 | * @return handle to abort the operation | 263 | * @return handle to abort the operation |
264 | */ | 264 | */ |
265 | struct GNUNET_IDENTITY_PROVIDER_Operation * | 265 | struct GNUNET_RECLAIM_Operation * |
266 | GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle *h, | 266 | GNUNET_RECLAIM_ticket_consume (struct GNUNET_RECLAIM_Handle *h, |
267 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 267 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, |
268 | const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, | 268 | const struct GNUNET_RECLAIM_Ticket *ticket, |
269 | GNUNET_IDENTITY_PROVIDER_AttributeResult cb, | 269 | GNUNET_RECLAIM_AttributeResult cb, |
270 | void *cb_cls); | 270 | void *cb_cls); |
271 | 271 | ||
272 | /** | 272 | /** |
@@ -286,12 +286,12 @@ GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle | |||
286 | * @param finish_cb_cls closure for @a finish_cb | 286 | * @param finish_cb_cls closure for @a finish_cb |
287 | * @return an iterator handle to use for iteration | 287 | * @return an iterator handle to use for iteration |
288 | */ | 288 | */ |
289 | struct GNUNET_IDENTITY_PROVIDER_TicketIterator * | 289 | struct GNUNET_RECLAIM_TicketIterator * |
290 | GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER_Handle *h, | 290 | GNUNET_RECLAIM_ticket_iteration_start (struct GNUNET_RECLAIM_Handle *h, |
291 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, | 291 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, |
292 | GNUNET_SCHEDULER_TaskCallback error_cb, | 292 | GNUNET_SCHEDULER_TaskCallback error_cb, |
293 | void *error_cb_cls, | 293 | void *error_cb_cls, |
294 | GNUNET_IDENTITY_PROVIDER_TicketCallback proc, | 294 | GNUNET_RECLAIM_TicketCallback proc, |
295 | void *proc_cls, | 295 | void *proc_cls, |
296 | GNUNET_SCHEDULER_TaskCallback finish_cb, | 296 | GNUNET_SCHEDULER_TaskCallback finish_cb, |
297 | void *finish_cb_cls); | 297 | void *finish_cb_cls); |
@@ -313,34 +313,34 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER | |||
313 | * @param finish_cb_cls closure for @a finish_cb | 313 | * @param finish_cb_cls closure for @a finish_cb |
314 | * @return an iterator handle to use for iteration | 314 | * @return an iterator handle to use for iteration |
315 | */ | 315 | */ |
316 | struct GNUNET_IDENTITY_PROVIDER_TicketIterator * | 316 | struct GNUNET_RECLAIM_TicketIterator * |
317 | GNUNET_IDENTITY_PROVIDER_ticket_iteration_start_rp (struct GNUNET_IDENTITY_PROVIDER_Handle *h, | 317 | GNUNET_RECLAIM_ticket_iteration_start_rp (struct GNUNET_RECLAIM_Handle *h, |
318 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 318 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
319 | GNUNET_SCHEDULER_TaskCallback error_cb, | 319 | GNUNET_SCHEDULER_TaskCallback error_cb, |
320 | void *error_cb_cls, | 320 | void *error_cb_cls, |
321 | GNUNET_IDENTITY_PROVIDER_TicketCallback proc, | 321 | GNUNET_RECLAIM_TicketCallback proc, |
322 | void *proc_cls, | 322 | void *proc_cls, |
323 | GNUNET_SCHEDULER_TaskCallback finish_cb, | 323 | GNUNET_SCHEDULER_TaskCallback finish_cb, |
324 | void *finish_cb_cls); | 324 | void *finish_cb_cls); |
325 | 325 | ||
326 | /** | 326 | /** |
327 | * Calls the record processor specified in #GNUNET_IDENTITY_PROVIDER_ticket_iteration_start | 327 | * Calls the record processor specified in #GNUNET_RECLAIM_ticket_iteration_start |
328 | * for the next record. | 328 | * for the next record. |
329 | * | 329 | * |
330 | * @param it the iterator | 330 | * @param it the iterator |
331 | */ | 331 | */ |
332 | void | 332 | void |
333 | GNUNET_IDENTITY_PROVIDER_ticket_iteration_next (struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it); | 333 | GNUNET_RECLAIM_ticket_iteration_next (struct GNUNET_RECLAIM_TicketIterator *it); |
334 | 334 | ||
335 | /** | 335 | /** |
336 | * Stops iteration and releases the idp handle for further calls. Must | 336 | * Stops iteration and releases the idp handle for further calls. Must |
337 | * be called on any iteration that has not yet completed prior to calling | 337 | * be called on any iteration that has not yet completed prior to calling |
338 | * #GNUNET_IDENTITY_PROVIDER_disconnect. | 338 | * #GNUNET_RECLAIM_disconnect. |
339 | * | 339 | * |
340 | * @param it the iterator | 340 | * @param it the iterator |
341 | */ | 341 | */ |
342 | void | 342 | void |
343 | GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it); | 343 | GNUNET_RECLAIM_ticket_iteration_stop (struct GNUNET_RECLAIM_TicketIterator *it); |
344 | 344 | ||
345 | /** | 345 | /** |
346 | * Disconnect from identity provider service. | 346 | * Disconnect from identity provider service. |
@@ -348,7 +348,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (struct GNUNET_IDENTITY_PROVIDER_ | |||
348 | * @param h identity provider service to disconnect | 348 | * @param h identity provider service to disconnect |
349 | */ | 349 | */ |
350 | void | 350 | void |
351 | GNUNET_IDENTITY_PROVIDER_disconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h); | 351 | GNUNET_RECLAIM_disconnect (struct GNUNET_RECLAIM_Handle *h); |
352 | 352 | ||
353 | 353 | ||
354 | /** | 354 | /** |
@@ -360,7 +360,7 @@ GNUNET_IDENTITY_PROVIDER_disconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h); | |||
360 | * @param op operation to cancel | 360 | * @param op operation to cancel |
361 | */ | 361 | */ |
362 | void | 362 | void |
363 | GNUNET_IDENTITY_PROVIDER_cancel (struct GNUNET_IDENTITY_PROVIDER_Operation *op); | 363 | GNUNET_RECLAIM_cancel (struct GNUNET_RECLAIM_Operation *op); |
364 | 364 | ||
365 | #if 0 /* keep Emacsens' auto-indent happy */ | 365 | #if 0 /* keep Emacsens' auto-indent happy */ |
366 | { | 366 | { |
@@ -370,9 +370,9 @@ GNUNET_IDENTITY_PROVIDER_cancel (struct GNUNET_IDENTITY_PROVIDER_Operation *op); | |||
370 | #endif | 370 | #endif |
371 | 371 | ||
372 | 372 | ||
373 | /* ifndef GNUNET_IDENTITY_PROVIDER_SERVICE_H */ | 373 | /* ifndef GNUNET_RECLAIM_SERVICE_H */ |
374 | #endif | 374 | #endif |
375 | 375 | ||
376 | /** @} */ /* end of group identity */ | 376 | /** @} */ /* end of group identity */ |
377 | 377 | ||
378 | /* end of gnunet_identity_provider_service.h */ | 378 | /* end of gnunet_reclaim_service.h */ |