1 files changed, 171 insertions, 26 deletions

diff --git a/src/include/gnunet_reclaim_plugin.h b/src/include/gnunet_reclaim_plugin.h
index ddd98697f..ed6663bb5 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -27,8 +27,8 @@
  * @defgroup reclaim-attribute-plugin  reclaim plugin API for attributes/claims
  * @{
  */
-#ifndef GNUNET_RECLAIM_AttributePLUGIN_H
-#define GNUNET_RECLAIM_AttributePLUGIN_H
+#ifndef GNUNET_RECLAIM_PLUGIN_H
+#define GNUNET_RECLAIM_PLUGIN_H
 
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_lib.h"
@@ -114,7 +114,7 @@ typedef const char *(*GNUNET_RECLAIM_AttributeNumberToTypenameFunction) (
  * @param data_size number of bytes in @a data
  * @return NULL on error, otherwise human-readable representation of the value
  */
-typedef char *(*GNUNET_RECLAIM_AttestationValueToStringFunction) (
+typedef char *(*GNUNET_RECLAIM_CredentialValueToStringFunction) (
   void *cls,
   uint32_t type,
   const void *data,
@@ -133,7 +133,7 @@ typedef char *(*GNUNET_RECLAIM_AttestationValueToStringFunction) (
  * @param data_size set to number of bytes in @a data
  * @return #GNUNET_OK on success
  */
-typedef int (*GNUNET_RECLAIM_AttestationStringToValueFunction) (
+typedef int (*GNUNET_RECLAIM_CredentialStringToValueFunction) (
   void *cls,
   uint32_t type,
   const char *s,
@@ -149,7 +149,7 @@ typedef int (*GNUNET_RECLAIM_AttestationStringToValueFunction) (
  * @param typename name to convert
  * @return corresponding number, UINT32_MAX on error
  */
-typedef uint32_t (*GNUNET_RECLAIM_AttestationTypenameToNumberFunction) (
+typedef uint32_t (*GNUNET_RECLAIM_CredentialTypenameToNumberFunction) (
   void *cls,
   const char *typename);
 
@@ -162,47 +162,151 @@ typedef uint32_t (*GNUNET_RECLAIM_AttestationTypenameToNumberFunction) (
  * @param type number of a type to convert
  * @return corresponding typestring, NULL on error
  */
-typedef const char *(*GNUNET_RECLAIM_AttestationNumberToTypenameFunction) (
+typedef const char *(*GNUNET_RECLAIM_CredentialNumberToTypenameFunction) (
   void *cls,
   uint32_t type);
 
 /**
- * Function called to extract attributes from an attestation
+ * Function called to extract attributes from a credential
  *
  * @param cls closure
- * @param attest the attestation object
+ * @param cred the credential object
  * @return an attribute list
  */
 typedef struct
   GNUNET_RECLAIM_AttributeList *(*
-GNUNET_RECLAIM_AttestationGetAttributesFunction) (
+GNUNET_RECLAIM_CredentialGetAttributesFunction) (
   void *cls,
-  const struct GNUNET_RECLAIM_Attestation *attest);
+  const struct GNUNET_RECLAIM_Credential *cred);
 
 /**
- * Function called to get the issuer of the attestation (as string)
+ * Function called to get the issuer of the credential (as string)
  *
  * @param cls closure
- * @param attest the attestation object
+ * @param cred the credential object
  * @return corresponding issuer string
  */
-typedef char *(*GNUNET_RECLAIM_AttestationGetIssuerFunction) (
+typedef char *(*GNUNET_RECLAIM_CredentialGetIssuerFunction) (
   void *cls,
-  const struct GNUNET_RECLAIM_Attestation *attest);
+  const struct GNUNET_RECLAIM_Credential *cred);
 
 /**
- * Function called to get the expiration of the attestation
+ * Function called to get the expiration of the credential
  *
  * @param cls closure
- * @param attest the attestation object
+ * @param cred the credential object
  * @param where to write the value
  * @return GNUNET_OK if successful
  */
-typedef int (*GNUNET_RECLAIM_AttestationGetExpirationFunction) (
+typedef int (*GNUNET_RECLAIM_CredentialGetExpirationFunction) (
   void *cls,
-  const struct GNUNET_RECLAIM_Attestation *attest,
+  const struct GNUNET_RECLAIM_Credential *cred,
   struct GNUNET_TIME_Absolute *expiration);
 
+/**
+ * Function called to convert the binary value @a data of an attribute of
+ * type @a type to a human-readable string.
+ *
+ * @param cls closure
+ * @param type type of the attribute
+ * @param data value in binary encoding
+ * @param data_size number of bytes in @a data
+ * @return NULL on error, otherwise human-readable representation of the value
+ */
+typedef char *(*GNUNET_RECLAIM_PresentationValueToStringFunction) (
+  void *cls,
+  uint32_t type,
+  const void *data,
+  size_t data_size);
+
+
+/**
+ * Function called to convert human-readable version of the value @a s
+ * of an attribute of type @a type to the respective binary
+ * representation.
+ *
+ * @param cls closure
+ * @param type type of the attribute
+ * @param s human-readable string
+ * @param data set to value in binary encoding (will be allocated)
+ * @param data_size set to number of bytes in @a data
+ * @return #GNUNET_OK on success
+ */
+typedef int (*GNUNET_RECLAIM_PresentationStringToValueFunction) (
+  void *cls,
+  uint32_t type,
+  const char *s,
+  void **data,
+  size_t *data_size);
+
+
+/**
+ * Function called to convert a type name to the
+ * corresponding number.
+ *
+ * @param cls closure
+ * @param typename name to convert
+ * @return corresponding number, UINT32_MAX on error
+ */
+typedef uint32_t (*GNUNET_RECLAIM_PresentationTypenameToNumberFunction) (
+  void *cls,
+  const char *typename);
+
+
+/**
+ * Function called to convert a type number (i.e. 1) to the
+ * corresponding type string
+ *
+ * @param cls closure
+ * @param type number of a type to convert
+ * @return corresponding typestring, NULL on error
+ */
+typedef const char *(*GNUNET_RECLAIM_PresentationNumberToTypenameFunction) (
+  void *cls,
+  uint32_t type);
+
+/**
+ * Function called to extract attributes from a credential
+ *
+ * @param cls closure
+ * @param cred the credential object
+ * @return an attribute list
+ */
+typedef struct
+  GNUNET_RECLAIM_AttributeList *(*
+GNUNET_RECLAIM_PresentationGetAttributesFunction) (
+  void *cls,
+  const struct GNUNET_RECLAIM_Presentation *cred);
+
+/**
+ * Function called to get the issuer of the credential (as string)
+ *
+ * @param cls closure
+ * @param cred the credential object
+ * @return corresponding issuer string
+ */
+typedef char *(*GNUNET_RECLAIM_PresentationGetIssuerFunction) (
+  void *cls,
+  const struct GNUNET_RECLAIM_Presentation *cred);
+
+/**
+ * Function called to get the expiration of the credential
+ *
+ * @param cls closure
+ * @param cred the credential object
+ * @param where to write the value
+ * @return GNUNET_OK if successful
+ */
+typedef int (*GNUNET_RECLAIM_PresentationGetExpirationFunction) (
+  void *cls,
+  const struct GNUNET_RECLAIM_Presentation *cred,
+  struct GNUNET_TIME_Absolute *expiration);
+
+typedef int (*GNUNET_RECLAIM_CredentialToPresentation) (
+  void *cls,
+  const struct GNUNET_RECLAIM_Credential *cred,
+  const struct GNUNET_RECLAIM_AttributeList *attrs,
+  struct GNUNET_RECLAIM_Presentation **presentation);
 
 /**
  * Each plugin is required to return a pointer to a struct of this
@@ -241,7 +345,7 @@ struct GNUNET_RECLAIM_AttributePluginFunctions
  * Each plugin is required to return a pointer to a struct of this
  * type as the return value from its entry point.
  */
-struct GNUNET_RECLAIM_AttestationPluginFunctions
+struct GNUNET_RECLAIM_CredentialPluginFunctions
 {
   /**
    * Closure for all of the callbacks.
@@ -251,37 +355,78 @@ struct GNUNET_RECLAIM_AttestationPluginFunctions
   /**
    * Conversion to string.
    */
-  GNUNET_RECLAIM_AttestationValueToStringFunction value_to_string;
+  GNUNET_RECLAIM_CredentialValueToStringFunction value_to_string;
+
+  /**
+   * Conversion to binary.
+   */
+  GNUNET_RECLAIM_CredentialStringToValueFunction string_to_value;
+
+  /**
+   * Typename to number.
+   */
+  GNUNET_RECLAIM_CredentialTypenameToNumberFunction typename_to_number;
+
+  /**
+   * Number to typename.
+   */
+  GNUNET_RECLAIM_CredentialNumberToTypenameFunction number_to_typename;
+
+  /**
+   * Attesation attributes.
+   */
+  GNUNET_RECLAIM_CredentialGetAttributesFunction get_attributes;
+
+  /**
+   * Attesation issuer.
+   */
+  GNUNET_RECLAIM_CredentialGetIssuerFunction get_issuer;
+
+  /**
+   * Expiration.
+   */
+  GNUNET_RECLAIM_CredentialGetExpirationFunction get_expiration;
+
+  /**
+   * Conversion to string.
+   */
+  GNUNET_RECLAIM_PresentationValueToStringFunction value_to_string_p;
 
   /**
    * Conversion to binary.
    */
-  GNUNET_RECLAIM_AttestationStringToValueFunction string_to_value;
+  GNUNET_RECLAIM_PresentationStringToValueFunction string_to_value_p;
 
   /**
    * Typename to number.
    */
-  GNUNET_RECLAIM_AttestationTypenameToNumberFunction typename_to_number;
+  GNUNET_RECLAIM_PresentationTypenameToNumberFunction typename_to_number_p;
 
   /**
    * Number to typename.
    */
-  GNUNET_RECLAIM_AttestationNumberToTypenameFunction number_to_typename;
+  GNUNET_RECLAIM_PresentationNumberToTypenameFunction number_to_typename_p;
 
   /**
    * Attesation attributes.
    */
-  GNUNET_RECLAIM_AttestationGetAttributesFunction get_attributes;
+  GNUNET_RECLAIM_PresentationGetAttributesFunction get_attributes_p;
 
   /**
    * Attesation issuer.
    */
-  GNUNET_RECLAIM_AttestationGetIssuerFunction get_issuer;
+  GNUNET_RECLAIM_PresentationGetIssuerFunction get_issuer_p;
 
   /**
    * Expiration.
    */
-  GNUNET_RECLAIM_AttestationGetExpirationFunction get_expiration;
+  GNUNET_RECLAIM_PresentationGetExpirationFunction get_expiration_p;
+
+  /**
+   * Get presentation
+   */
+  GNUNET_RECLAIM_CredentialToPresentation create_presentation;
+
 };