[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 127/171: -revise API naming; cleanups
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 127/171: -revise API naming; cleanups |
|
Date: |
Thu, 04 Jan 2018 16:10:35 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit 371458b9ed084c6d510a03c9ea27cb8162f0e87a
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Fri Oct 6 16:55:48 2017 +0200
-revise API naming; cleanups
---
src/identity-provider/gnunet-idp.c | 22 ++++++------
src/identity-provider/identity_provider_api.c | 32 ++++++++---------
src/include/gnunet_identity_provider_service.h | 50 +++++++++++++-------------
src/include/gnunet_protocols.h | 34 +++++++-----------
4 files changed, 65 insertions(+), 73 deletions(-)
diff --git a/src/identity-provider/gnunet-idp.c
b/src/identity-provider/gnunet-idp.c
index bc30a1148..d6544eb3b 100644
--- a/src/identity-provider/gnunet-idp.c
+++ b/src/identity-provider/gnunet-idp.c
@@ -193,20 +193,20 @@ iter_finished (void *cls)
}
if (issue_attrs) {
- idp_op = GNUNET_IDENTITY_PROVIDER_idp_ticket_issue (idp_handle,
- pkey,
- &rp_key,
- attr_list,
- &ticket_issue_cb,
- NULL);
+ idp_op = GNUNET_IDENTITY_PROVIDER_ticket_issue (idp_handle,
+ pkey,
+ &rp_key,
+ attr_list,
+ &ticket_issue_cb,
+ NULL);
return;
}
if (consume_ticket) {
- idp_op = GNUNET_IDENTITY_PROVIDER_rp_ticket_consume (idp_handle,
- pkey,
- &ticket,
- &process_attrs,
- NULL);
+ idp_op = GNUNET_IDENTITY_PROVIDER_ticket_consume (idp_handle,
+ pkey,
+ &ticket,
+ &process_attrs,
+ NULL);
return;
}
attr = GNUNET_IDENTITY_PROVIDER_attribute_new (attr_name,
diff --git a/src/identity-provider/identity_provider_api.c
b/src/identity-provider/identity_provider_api.c
index d623eaf3b..33468cc13 100644
--- a/src/identity-provider/identity_provider_api.c
+++ b/src/identity-provider/identity_provider_api.c
@@ -1027,12 +1027,12 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct
GNUNET_IDENTITY_PROVIDER_At
* @return handle to abort the operation
*/
struct GNUNET_IDENTITY_PROVIDER_Operation *
-GNUNET_IDENTITY_PROVIDER_idp_ticket_issue (struct
GNUNET_IDENTITY_PROVIDER_Handle *h,
- const struct
GNUNET_CRYPTO_EcdsaPrivateKey *iss,
- const struct
GNUNET_CRYPTO_EcdsaPublicKey *rp,
- const struct
GNUNET_IDENTITY_PROVIDER_AttributeList *attrs,
-
GNUNET_IDENTITY_PROVIDER_TicketCallback cb,
- void *cb_cls)
+GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle
*h,
+ const struct
GNUNET_CRYPTO_EcdsaPrivateKey *iss,
+ const struct
GNUNET_CRYPTO_EcdsaPublicKey *rp,
+ const struct
GNUNET_IDENTITY_PROVIDER_AttributeList *attrs,
+ GNUNET_IDENTITY_PROVIDER_TicketCallback
cb,
+ void *cb_cls)
{
struct GNUNET_IDENTITY_PROVIDER_Operation *op;
struct TicketIssueMessage *tim;
@@ -1076,8 +1076,8 @@ GNUNET_IDENTITY_PROVIDER_idp_ticket_issue (struct
GNUNET_IDENTITY_PROVIDER_Handl
* @return handle to abort the operation
*/
struct GNUNET_IDENTITY_PROVIDER_Operation *
-GNUNET_IDENTITY_PROVIDER_rp_ticket_consume (struct
GNUNET_IDENTITY_PROVIDER_Handle *h,
- const struct
GNUNET_CRYPTO_EcdsaPrivateKey * identity,
+GNUNET_IDENTITY_PROVIDER_ticket_consume (struct
GNUNET_IDENTITY_PROVIDER_Handle *h,
+ const struct
GNUNET_CRYPTO_EcdsaPrivateKey *identity,
const struct
GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
GNUNET_IDENTITY_PROVIDER_AttributeResult cb,
void *cb_cls)
@@ -1129,14 +1129,14 @@ GNUNET_IDENTITY_PROVIDER_rp_ticket_consume (struct
GNUNET_IDENTITY_PROVIDER_Hand
* @return an iterator handle to use for iteration
*/
struct GNUNET_IDENTITY_PROVIDER_TicketIterator *
-GNUNET_IDENTITY_PROVIDER_idp_ticket_iteration_start (struct
GNUNET_IDENTITY_PROVIDER_Handle *h,
- const struct
GNUNET_CRYPTO_EcdsaPrivateKey *identity,
-
GNUNET_SCHEDULER_TaskCallback error_cb,
- void *error_cb_cls,
-
GNUNET_IDENTITY_PROVIDER_TicketCallback proc,
- void *proc_cls,
-
GNUNET_SCHEDULER_TaskCallback finish_cb,
- void *finish_cb_cls)
+GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct
GNUNET_IDENTITY_PROVIDER_Handle *h,
+ const struct
GNUNET_CRYPTO_EcdsaPrivateKey *identity,
+ GNUNET_SCHEDULER_TaskCallback
error_cb,
+ void *error_cb_cls,
+
GNUNET_IDENTITY_PROVIDER_TicketCallback proc,
+ void *proc_cls,
+ GNUNET_SCHEDULER_TaskCallback
finish_cb,
+ void *finish_cb_cls)
{
struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it;
struct GNUNET_CRYPTO_EcdsaPublicKey identity_pub;
diff --git a/src/include/gnunet_identity_provider_service.h
b/src/include/gnunet_identity_provider_service.h
index fb5131567..d1b437128 100644
--- a/src/include/gnunet_identity_provider_service.h
+++ b/src/include/gnunet_identity_provider_service.h
@@ -319,12 +319,12 @@ typedef void
* @return handle to abort the operation
*/
struct GNUNET_IDENTITY_PROVIDER_Operation *
-GNUNET_IDENTITY_PROVIDER_idp_ticket_issue (struct
GNUNET_IDENTITY_PROVIDER_Handle *id,
- const struct
GNUNET_CRYPTO_EcdsaPrivateKey *iss,
- const struct
GNUNET_CRYPTO_EcdsaPublicKey *rp,
- const struct
GNUNET_IDENTITY_PROVIDER_AttributeList *attrs,
-
GNUNET_IDENTITY_PROVIDER_TicketCallback cb,
- void *cb_cls);
+GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle
*id,
+ const struct
GNUNET_CRYPTO_EcdsaPrivateKey *iss,
+ const struct
GNUNET_CRYPTO_EcdsaPublicKey *rp,
+ const struct
GNUNET_IDENTITY_PROVIDER_AttributeList *attrs,
+ GNUNET_IDENTITY_PROVIDER_TicketCallback
cb,
+ void *cb_cls);
/** TODO
* Revoked an issued ticket. The relying party will be unable to retrieve
@@ -338,11 +338,11 @@ GNUNET_IDENTITY_PROVIDER_idp_ticket_issue (struct
GNUNET_IDENTITY_PROVIDER_Handl
* @return handle to abort the operation
*/
struct GNUNET_IDENTITY_PROVIDER_Operation *
-GNUNET_IDENTITY_PROVIDER_idp_ticket_revoke (struct
GNUNET_IDENTITY_PROVIDER_Handle *id,
- const struct
GNUNET_CRYPTO_EcdsaPrivateKey *identity,
- const struct
GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
-
GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus cb,
- void *cb_cls);
+GNUNET_IDENTITY_PROVIDER_ticket_revoke (struct GNUNET_IDENTITY_PROVIDER_Handle
*id,
+ const struct
GNUNET_CRYPTO_EcdsaPrivateKey *identity,
+ const struct
GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
+
GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus cb,
+ void *cb_cls);
@@ -351,18 +351,18 @@ GNUNET_IDENTITY_PROVIDER_idp_ticket_revoke (struct
GNUNET_IDENTITY_PROVIDER_Hand
* and used to retrieve identity information from the issuer
*
* @param id the identity provider to use
- * @param identity the identity that is the subject of the issued ticket (the
relying party)
+ * @param identity the identity that is the subject of the issued ticket (the
audience)
* @param ticket the issued ticket to consume
* @param cb the callback to call
* @param cb_cls the callback closure
* @return handle to abort the operation
*/
struct GNUNET_IDENTITY_PROVIDER_Operation *
-GNUNET_IDENTITY_PROVIDER_rp_ticket_consume (struct
GNUNET_IDENTITY_PROVIDER_Handle *id,
- const struct
GNUNET_CRYPTO_EcdsaPrivateKey * identity,
- const struct
GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
-
GNUNET_IDENTITY_PROVIDER_AttributeResult cb,
- void *cb_cls);
+GNUNET_IDENTITY_PROVIDER_ticket_consume (struct
GNUNET_IDENTITY_PROVIDER_Handle *id,
+ const struct
GNUNET_CRYPTO_EcdsaPrivateKey *identity,
+ const struct
GNUNET_IDENTITY_PROVIDER_Ticket *ticket,
+
GNUNET_IDENTITY_PROVIDER_AttributeResult cb,
+ void *cb_cls);
/**
* Lists all tickets that have been issued to remote
@@ -382,14 +382,14 @@ GNUNET_IDENTITY_PROVIDER_rp_ticket_consume (struct
GNUNET_IDENTITY_PROVIDER_Hand
* @return an iterator handle to use for iteration
*/
struct GNUNET_IDENTITY_PROVIDER_TicketIterator *
-GNUNET_IDENTITY_PROVIDER_idp_ticket_iteration_start (struct
GNUNET_IDENTITY_PROVIDER_Handle *h,
- const struct
GNUNET_CRYPTO_EcdsaPrivateKey *identity,
-
GNUNET_SCHEDULER_TaskCallback error_cb,
- void *error_cb_cls,
-
GNUNET_IDENTITY_PROVIDER_TicketCallback proc,
- void *proc_cls,
-
GNUNET_SCHEDULER_TaskCallback finish_cb,
- void *finish_cb_cls);
+GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct
GNUNET_IDENTITY_PROVIDER_Handle *h,
+ const struct
GNUNET_CRYPTO_EcdsaPrivateKey *identity,
+ GNUNET_SCHEDULER_TaskCallback
error_cb,
+ void *error_cb_cls,
+
GNUNET_IDENTITY_PROVIDER_TicketCallback proc,
+ void *proc_cls,
+ GNUNET_SCHEDULER_TaskCallback
finish_cb,
+ void *finish_cb_cls);
/**
* Lists all tickets that have been issued to remote
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index b22e1b417..dd806fcac 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2620,39 +2620,31 @@ extern "C"
*
* IDENTITY PROVIDER MESSAGE TYPES
*/
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE 961
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE 961
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_EXCHANGE 962
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE_RESPONSE 962
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_RESULT 963
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_START 963
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_EXCHANGE_RESULT 964
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_STOP 964
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE 965
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_NEXT 965
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE_RESPONSE 966
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT 966
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_START 967
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ISSUE 967
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_STOP 968
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT 968
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_NEXT 969
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET 969
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT 970
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET_RESULT 970
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ISSUE 971
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_START 971
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT 972
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_STOP 972
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET 973
-
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET_RESULT 974
-
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_START 975
-
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_STOP 976
-
-#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_NEXT 977
+#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_NEXT 973
/**************************************************
*
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 117/171: -add comments, (continued)
- [GNUnet-SVN] [gnunet] 117/171: -add comments, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 122/171: -fix bugs, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 169/171: update README, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 153/171: -add j to make, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 128/171: -readd new rest plugin, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 171/171: Merge remote-tracking branch 'origin/identity_abe', gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 110/171: Merge remote-tracking branch 'origin/master' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 113/171: - Add attribute store API to IdP service, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 132/171: -finish revocation in service, cleanup, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 119/171: -add consume API, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 127/171: -revise API naming; cleanups,
gnunet <=
- [GNUnet-SVN] [gnunet] 163/171: -move jwt back into idp, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 144/171: -fixes, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 149/171: -fix make, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 93/171: -more towards idp2, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 133/171: -fixes, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 150/171: -add dockerfile, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 159/171: Merge remote-tracking branch 'origin/master' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 164/171: Merge remote-tracking branch 'origin/master' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 166/171: -move idp experimental, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 168/171: -move abe functionality out of util; prepare for release, gnunet, 2018/01/04