8 files changed, 32 insertions, 200 deletions

diff --git a/src/reclaim/did.h b/src/reclaim/did.h
index fc465da3b..42f65db26 100644
--- a/src/reclaim/did.h
+++ b/src/reclaim/did.h
@@ -25,7 +25,7 @@
 
 /**
  * Create a DID string from an ego in the format
- * did:gns:<pubkey>
+ * did:gns:\<pubkey\>
  *
  * @param ego the Ego to use
  * @return the DID string
@@ -36,7 +36,7 @@ DID_ego_to_did (struct GNUNET_IDENTITY_Ego *ego);
 
 /**
  * Extract the public key from a DID
- * in the format did:gns:<pubkey>
+ * in the format did:gns:\<pubkey\>
  *
  * @param did the DID parse
  * @param pk where to store the public key
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c
index 84a98d1e4..5290621d6 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -522,7 +522,7 @@ cleanup_adh (struct AttributeDeleteHandle *adh)
 /**
  * Cleanup attribute store handle
  *
- * @param handle handle to clean up
+ * @param ash handle to clean up
  */
 static void
 cleanup_as_handle (struct AttributeStoreHandle *ash)
@@ -723,8 +723,8 @@ issue_ticket_result_cb (void *cls,
 /**
  * Check issue ticket message
  *
- * @cls unused
- * @im message to check
+ * @param cls unused
+ * @param im message to check
  * @return GNUNET_OK if message is ok
  */
 static int
@@ -937,7 +937,7 @@ check_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm)
  * Handle a consume ticket message
  *
  * @param cls our client handle
- * @cm the message to handle
+ * @param cm the message to handle
  */
 static void
 handle_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm)
@@ -1686,8 +1686,8 @@ attr_delete_cont (void *cls, int32_t success, const char *emsg)
 /**
  * Check attribute delete message format
  *
- * @cls unused
- * @dam message to check
+ * @param cls unused
+ * @param dam message to check
  */
 static int
 check_attribute_delete_message (void *cls,
@@ -1777,8 +1777,8 @@ cred_delete_cont (void *cls, int32_t success, const char *emsg)
 /**
  * Check credential delete message format
  *
- * @cls unused
- * @dam message to check
+ * @param cls unused
+ * @param dam message to check
  */
 static int
 check_credential_delete_message (void *cls,
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c
index 23b617a7f..a17dfb0e2 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/reclaim/gnunet-service-reclaim_tickets.c
@@ -485,7 +485,7 @@ rvk_ticket_update_finished (void *cls)
  * @param cls handle to the operation
  * @param zone ticket issuer private key
  * @param label ticket rnd
- * @param rd_cound size of record set
+ * @param rd_count size of record set
  * @param rd record set
  */
 static void
@@ -568,9 +568,8 @@ rvk_ns_err (void *cls)
  * want to revoke.
  * When we are done, we need to update any other ticket which
  * included references to any of the changed attributes.
- * (Implementation further below)
  *
- * @param rvk handle to the operation
+ * @param rh handle to the operation
  */
 static void
 move_attrs (struct RECLAIM_TICKETS_RevokeHandle *rh);
@@ -757,14 +756,6 @@ rvk_move_attr_cb (void *cls,
 }
 
 
-/**
- * We change every attribute ID of the ticket attributes we
- * want to revoke.
- * When we are done, we need to update any other ticket which
- * included references to any of the changed attributes.
- *
- * @param rvk handle to the operation
- */
 static void
 move_attrs (struct RECLAIM_TICKETS_RevokeHandle *rvk)
 {
@@ -844,7 +835,7 @@ remove_ticket_cont (void *cls, int32_t success, const char *emsg)
  * @param cls handle to the operation
  * @param zone the issuer key
  * @param label ticket rnd
- * @param rd_cound size of record set
+ * @param rd_count size of record set
  * @param rd record set
  */
 static void
@@ -995,7 +986,7 @@ cleanup_cth (struct RECLAIM_TICKETS_ConsumeHandle *cth)
  * We found an attribute record.
  *
  * @param cls handle to the operation
- * @param rd_cound size of record set
+ * @param rd_count size of record set
  * @param rd record set
  */
 static void
@@ -1083,7 +1074,7 @@ abort_parallel_lookups (void *cls)
  * attribute record under the referenced label.
  *
  * @param cls handle to the operation
- * @param rd_cound size of the record set
+ * @param rd_count size of the record set
  * @param rd record set
  */
 static void
@@ -1671,7 +1662,7 @@ cleanup_iter (struct RECLAIM_TICKETS_Iterator *iter)
 
 
 /**
- * Return each record of type @GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET
+ * Return each record of type #GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET
  * to the caller and proceed with the iteration.
  * FIXME: Should we _not_ proceed automatically here?
  *
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c
index 11963c345..90c33375f 100644
--- a/src/reclaim/oidc_helper.c
+++ b/src/reclaim/oidc_helper.c
@@ -423,17 +423,6 @@ generate_id_token_body (const struct GNUNET_IDENTITY_PublicKey *aud_key,
 }
 
 
-/**
- * Create a JWT using RSA256 algorithm from attributes
- *
- * @param aud_key the public of the audience
- * @param sub_key the public key of the subject
- * @param attrs the attribute list
- * @param presentations credential presentation list (may be empty)
- * @param expiration_time the validity of the token
- * @param secret_rsa_key the key used to sign the JWT
- * @return a new base64-encoded JWT string.
- */
 char *
 OIDC_generate_id_token_rsa (const struct GNUNET_IDENTITY_PublicKey *aud_key,
                             const struct GNUNET_IDENTITY_PublicKey *sub_key,
diff --git a/src/reclaim/oidc_helper.h b/src/reclaim/oidc_helper.h
index b134c71ad..81eadf2ed 100644
--- a/src/reclaim/oidc_helper.h
+++ b/src/reclaim/oidc_helper.h
@@ -50,14 +50,14 @@ enum OIDC_VerificationOptions
 };
 
 /**
- * Create a JWT using RSA256 from attributes
+ * Create a JWT using RSA256 algorithm from attributes
  *
  * @param aud_key the public of the audience
  * @param sub_key the public key of the subject
  * @param attrs the attribute list
  * @param presentations credential presentation list (may be empty)
  * @param expiration_time the validity of the token
- * @param secret_key the key used to sign the JWT
+ * @param secret_rsa_key the key used to sign the JWT
  * @return a new base64-encoded JWT string.
  */
 char *
@@ -162,7 +162,7 @@ OIDC_access_token_new (const struct GNUNET_RECLAIM_Ticket *ticket);
  * Parse an access token
  */
 int
-OIDC_access_token_parse (const char*token,
+OIDC_access_token_parse (const char *token,
                          struct GNUNET_RECLAIM_Ticket **ticket);
 
 
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c
index bc6b835c9..6f55d62e4 100644
--- a/src/reclaim/reclaim_api.c
+++ b/src/reclaim/reclaim_api.c
@@ -1076,14 +1076,6 @@ GNUNET_RECLAIM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
 }
 
 
-/**
- * Cancel an operation. Note that the operation MAY still
- * be executed; this merely cancels the continuation; if the request
- * was already transmitted, the service may still choose to complete
- * the operation.
- *
- * @param op operation to cancel
- */
 void
 GNUNET_RECLAIM_cancel (struct GNUNET_RECLAIM_Operation *op)
 {
@@ -1210,23 +1202,11 @@ GNUNET_RECLAIM_attribute_delete (
 }
 
 
-/**
-   * Store an credential.  If the credential is already present,
-   * it is replaced with the new credential.
-   *
-   * @param h handle to the re:claimID service
-   * @param pkey private key of the identity
-   * @param attr the credential value
-   * @param exp_interval the relative expiration interval for the credential
-   * @param cont continuation to call when done
-   * @param cont_cls closure for @a cont
-   * @return handle to abort the request
-   */
 struct GNUNET_RECLAIM_Operation *
 GNUNET_RECLAIM_credential_store (
   struct GNUNET_RECLAIM_Handle *h,
   const struct GNUNET_IDENTITY_PrivateKey *pkey,
-  const struct GNUNET_RECLAIM_Credential *attr,
+  const struct GNUNET_RECLAIM_Credential *credential,
   const struct GNUNET_TIME_Relative *exp_interval,
   GNUNET_RECLAIM_ContinuationWithStatus cont,
   void *cont_cls)
@@ -1241,7 +1221,7 @@ GNUNET_RECLAIM_credential_store (
   op->cls = cont_cls;
   op->r_id = h->r_id_gen++;
   GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op);
-  attr_len = GNUNET_RECLAIM_credential_serialize_get_size (attr);
+  attr_len = GNUNET_RECLAIM_credential_serialize_get_size (credential);
   op->env = GNUNET_MQ_msg_extra (sam,
                                  attr_len,
                                  GNUNET_MESSAGE_TYPE_RECLAIM_CREDENTIAL_STORE);
@@ -1249,7 +1229,7 @@ GNUNET_RECLAIM_credential_store (
   sam->id = htonl (op->r_id);
   sam->exp = GNUNET_htonll (exp_interval->rel_value_us);
 
-  GNUNET_RECLAIM_credential_serialize (attr, (char *) &sam[1]);
+  GNUNET_RECLAIM_credential_serialize (credential, (char *) &sam[1]);
 
   sam->attr_len = htons (attr_len);
   if (NULL != h->mq)
@@ -1258,17 +1238,6 @@ GNUNET_RECLAIM_credential_store (
 }
 
 
-/**
-   * Delete an credential. Tickets used to share this credential are updated
-   * accordingly.
-   *
-   * @param h handle to the re:claimID service
-   * @param pkey Private key of the identity to add an attribute to
-   * @param attr The credential
-   * @param cont Continuation to call when done
-   * @param cont_cls Closure for @a cont
-   * @return handle Used to to abort the request
-   */
 struct GNUNET_RECLAIM_Operation *
 GNUNET_RECLAIM_credential_delete (
   struct GNUNET_RECLAIM_Handle *h,
@@ -1366,12 +1335,6 @@ GNUNET_RECLAIM_get_attributes_start (
 }
 
 
-/**
- * Calls the record processor specified in #GNUNET_RECLAIM_get_attributes_start
- * for the next record.
- *
- * @param it the iterator
- */
 void
 GNUNET_RECLAIM_get_attributes_next (struct GNUNET_RECLAIM_AttributeIterator *it)
 {
@@ -1476,12 +1439,6 @@ GNUNET_RECLAIM_get_credentials_start (
 }
 
 
-/**
- * Calls the record processor specified in #GNUNET_RECLAIM_get_credential_start
- * for the next record.
- *
- * @param it the iterator
- */
 void
 GNUNET_RECLAIM_get_credentials_next (struct
                                      GNUNET_RECLAIM_CredentialIterator *ait)
@@ -1497,13 +1454,6 @@ GNUNET_RECLAIM_get_credentials_next (struct
 }
 
 
-/**
- * Stops iteration and releases the handle for further calls. Must
- * be called on any iteration that has not yet completed prior to calling
- * #GNUNET_RECLAIM_disconnect.
- *
- * @param it the iterator
- */
 void
 GNUNET_RECLAIM_get_credentials_stop (struct
                                      GNUNET_RECLAIM_CredentialIterator *ait)
@@ -1524,19 +1474,6 @@ GNUNET_RECLAIM_get_credentials_stop (struct
 }
 
 
-/**
- * Issues a ticket to another relying party. The identity may use
- * @GNUNET_RECLAIM_ticket_consume to consume the ticket
- * and retrieve the attributes specified in the attribute list.
- *
- * @param h the reclaim to use
- * @param iss the issuing identity (= the user)
- * @param rp the subject of the ticket (= the relying party)
- * @param attrs the attributes that the relying party is given access to
- * @param cb the callback
- * @param cb_cls the callback closure
- * @return handle to abort the operation
- */
 struct GNUNET_RECLAIM_Operation *
 GNUNET_RECLAIM_ticket_issue (
   struct GNUNET_RECLAIM_Handle *h,
diff --git a/src/reclaim/reclaim_attribute.c b/src/reclaim/reclaim_attribute.c
index 560267578..b5c41b2d1 100644
--- a/src/reclaim/reclaim_attribute.c
+++ b/src/reclaim/reclaim_attribute.c
@@ -282,14 +282,6 @@ GNUNET_RECLAIM_attribute_new (const char *attr_name,
 }
 
 
-/**
- * Add a new attribute to a claim list
- *
- * @param attr_name the name of the new attribute claim
- * @param type the type of the claim
- * @param data claim payload
- * @param data_size claim payload size
- */
 void
 GNUNET_RECLAIM_attribute_list_add (
   struct GNUNET_RECLAIM_AttributeList *al,
@@ -333,16 +325,9 @@ GNUNET_RECLAIM_attribute_list_serialize_get_size (
 }
 
 
-/**
- * Serialize an attribute list
- *
- * @param attrs the attribute list to serialize
- * @param result the serialized attribute
- * @return length of serialized data
- */
 size_t
 GNUNET_RECLAIM_attribute_list_serialize (
-  const struct GNUNET_RECLAIM_AttributeList *al,
+  const struct GNUNET_RECLAIM_AttributeList *attrs,
   char *result)
 {
   struct GNUNET_RECLAIM_AttributeListEntry *ale;
@@ -351,7 +336,7 @@ GNUNET_RECLAIM_attribute_list_serialize (
   char *write_ptr;
   write_ptr = result;
   total_len = 0;
-  for (ale = al->list_head; NULL != ale; ale = ale->next)
+  for (ale = attrs->list_head; NULL != ale; ale = ale->next)
   {
     GNUNET_assert (NULL != ale->attribute);
     len = GNUNET_RECLAIM_attribute_serialize (ale->attribute, write_ptr);
@@ -404,21 +389,16 @@ GNUNET_RECLAIM_attribute_list_deserialize (const char *data, size_t data_size)
 }
 
 
-/**
- * Make a (deep) copy of a claim list
- * @param attrs claim list to copy
- * @return copied claim list
- */
 struct GNUNET_RECLAIM_AttributeList *
 GNUNET_RECLAIM_attribute_list_dup (
-  const struct GNUNET_RECLAIM_AttributeList *al)
+  const struct GNUNET_RECLAIM_AttributeList *attrs)
 {
   struct GNUNET_RECLAIM_AttributeListEntry *ale;
   struct GNUNET_RECLAIM_AttributeListEntry *result_ale;
   struct GNUNET_RECLAIM_AttributeList *result;
 
   result = GNUNET_new (struct GNUNET_RECLAIM_AttributeList);
-  for (ale = al->list_head; NULL != ale; ale = ale->next)
+  for (ale = attrs->list_head; NULL != ale; ale = ale->next)
   {
     result_ale = GNUNET_new (struct GNUNET_RECLAIM_AttributeListEntry);
     GNUNET_assert (NULL != ale->attribute);
@@ -441,11 +421,6 @@ GNUNET_RECLAIM_attribute_list_dup (
 }
 
 
-/**
- * Destroy claim list
- *
- * @param attrs list to destroy
- */
 void
 GNUNET_RECLAIM_attribute_list_destroy (
   struct GNUNET_RECLAIM_AttributeList *al)
diff --git a/src/reclaim/reclaim_credential.c b/src/reclaim/reclaim_credential.c
index b4aeedf29..6dc1a1fcf 100644
--- a/src/reclaim/reclaim_credential.c
+++ b/src/reclaim/reclaim_credential.c
@@ -250,15 +250,6 @@ GNUNET_RECLAIM_credential_value_to_string (uint32_t type,
 }
 
 
-/**
-   * Create a new credential.
-   *
-   * @param attr_name the credential name
-   * @param type the credential type
-   * @param data the credential value
-   * @param data_size the credential value size
-   * @return the new credential
-   */
 struct GNUNET_RECLAIM_Credential *
 GNUNET_RECLAIM_credential_new (const char *attr_name,
                                uint32_t type,
@@ -310,13 +301,6 @@ GNUNET_RECLAIM_credential_list_serialize_get_size (
 }
 
 
-/**
- * Serialize an attribute list
- *
- * @param attrs the attribute list to serialize
- * @param result the serialized attribute
- * @return length of serialized data
- */
 size_t
 GNUNET_RECLAIM_credential_list_serialize (
   const struct GNUNET_RECLAIM_CredentialList *credentials,
@@ -339,13 +323,6 @@ GNUNET_RECLAIM_credential_list_serialize (
 }
 
 
-/**
- * Deserialize an credential list
- *
- * @param data the serialized attribute list
- * @param data_size the length of the serialized data
- * @return a GNUNET_IDENTITY_PROVIDER_AttributeList, must be free'd by caller
- */
 struct GNUNET_RECLAIM_CredentialList *
 GNUNET_RECLAIM_credential_list_deserialize (const char *data, size_t data_size)
 {
@@ -415,19 +392,14 @@ GNUNET_RECLAIM_credential_list_dup (
 }
 
 
-/**
- * Destroy credential list
- *
- * @param attrs list to destroy
- */
 void
 GNUNET_RECLAIM_credential_list_destroy (
-  struct GNUNET_RECLAIM_CredentialList *al)
+  struct GNUNET_RECLAIM_CredentialList *credentials)
 {
   struct GNUNET_RECLAIM_CredentialListEntry *ale;
   struct GNUNET_RECLAIM_CredentialListEntry *tmp_ale;
 
-  for (ale = al->list_head; NULL != ale;)
+  for (ale = credentials->list_head; NULL != ale;)
   {
     if (NULL != ale->credential)
       GNUNET_free (ale->credential);
@@ -435,7 +407,7 @@ GNUNET_RECLAIM_credential_list_destroy (
     ale = ale->next;
     GNUNET_free (tmp_ale);
   }
-  GNUNET_free (al);
+  GNUNET_free (credentials);
 }
 
 
@@ -454,13 +426,6 @@ GNUNET_RECLAIM_credential_serialize_get_size (
 }
 
 
-/**
- * Serialize an credential
- *
- * @param attr the credential to serialize
- * @param result the serialized credential
- * @return length of serialized data
- */
 size_t
 GNUNET_RECLAIM_credential_serialize (
   const struct GNUNET_RECLAIM_Credential *credential,
@@ -627,12 +592,6 @@ GNUNET_RECLAIM_presentation_typename_to_number (const char *typename)
 }
 
 
-/**
- * Convert an presentation type number to the corresponding presentation type string
- *
- * @param type number of a type
- * @return corresponding typestring, NULL on error
- */
 const char *
 GNUNET_RECLAIM_presentation_number_to_typename (uint32_t type)
 {
@@ -758,13 +717,6 @@ GNUNET_RECLAIM_presentation_list_serialize_get_size (
 }
 
 
-/**
- * Serialize an attribute list
- *
- * @param attrs the attribute list to serialize
- * @param result the serialized attribute
- * @return length of serialized data
- */
 size_t
 GNUNET_RECLAIM_presentation_list_serialize (
   const struct GNUNET_RECLAIM_PresentationList *presentations,
@@ -862,19 +814,14 @@ GNUNET_RECLAIM_presentation_list_dup (
 }
 
 
-/**
- * Destroy presentation list
- *
- * @param attrs list to destroy
- */
 void
 GNUNET_RECLAIM_presentation_list_destroy (
-  struct GNUNET_RECLAIM_PresentationList *al)
+  struct GNUNET_RECLAIM_PresentationList *presentations)
 {
   struct GNUNET_RECLAIM_PresentationListEntry *ale;
   struct GNUNET_RECLAIM_PresentationListEntry *tmp_ale;
 
-  for (ale = al->list_head; NULL != ale;)
+  for (ale = presentations->list_head; NULL != ale;)
   {
     if (NULL != ale->presentation)
       GNUNET_free (ale->presentation);
@@ -882,7 +829,7 @@ GNUNET_RECLAIM_presentation_list_destroy (
     ale = ale->next;
     GNUNET_free (tmp_ale);
   }
-  GNUNET_free (al);
+  GNUNET_free (presentations);
 }
 
 
@@ -900,13 +847,6 @@ GNUNET_RECLAIM_presentation_serialize_get_size (
 }
 
 
-/**
- * Serialize an presentation
- *
- * @param attr the presentation to serialize
- * @param result the serialized presentation
- * @return length of serialized data
- */
 size_t
 GNUNET_RECLAIM_presentation_serialize (
   const struct GNUNET_RECLAIM_Presentation *presentation,