add expiration

3 files changed, 48 insertions, 9 deletions

diff --git a/src/include/gnunet_reclaim_lib.h b/src/include/gnunet_reclaim_lib.h
index 6d3503950..54d284f3c 100644
--- a/src/include/gnunet_reclaim_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
@@ -262,7 +262,8 @@ struct GNUNET_RECLAIM_AttestationListEntry
  */
 struct GNUNET_RECLAIM_Attribute *
 GNUNET_RECLAIM_attribute_new (const char *attr_name,
-                              const struct GNUNET_RECLAIM_Identifier *attestation,
+                              const struct
+                              GNUNET_RECLAIM_Identifier *attestation,
                               uint32_t type,
                               const void *data,
                               size_t data_size);
@@ -489,7 +490,6 @@ GNUNET_RECLAIM_attestation_list_deserialize (const char *data,
                                              size_t data_size);
 
 
-
 /**
    * @param attestation the attestation to serialize
    * @return the required buffer size
@@ -593,8 +593,17 @@ GNUNET_RECLAIM_attestation_typename_to_number (const char *typename);
  * @return corresponding number, UINT32_MAX on error
  */
 struct GNUNET_RECLAIM_AttributeList*
-GNUNET_RECLAIM_attestation_get_attributes (const struct GNUNET_RECLAIM_Attestation *attest);
+GNUNET_RECLAIM_attestation_get_attributes (const struct
+                                           GNUNET_RECLAIM_Attestation *attest);
+
+char*
+GNUNET_RECLAIM_attestation_get_issuer (const struct
+                                       GNUNET_RECLAIM_Attestation *attest);
 
+int
+GNUNET_RECLAIM_attestation_get_expiration (const struct
+                                           GNUNET_RECLAIM_Attestation *attest,
+                                           struct GNUNET_TIME_Absolute *exp);
 
 #if 0 /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/include/gnunet_reclaim_plugin.h b/src/include/gnunet_reclaim_plugin.h
index d42ac9502..992ad0cc3 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -166,17 +166,40 @@ typedef const char *(*GNUNET_RECLAIM_AttestationNumberToTypenameFunction) (
   uint32_t type);
 
 /**
- * Function called to convert a type number (i.e. 1) to the
- * corresponding type string
+ * Function called to extract attributes from an attestation
  *
  * @param cls closure
- * @param type number of a type to convert
- * @return corresponding typestring, NULL on error
+ * @param attest the attestation object
+ * @return an attribute list
  */
 typedef struct GNUNET_RECLAIM_AttributeList *(*GNUNET_RECLAIM_AttestationGetAttributesFunction) (
   void *cls,
   const struct GNUNET_RECLAIM_Attestation *attest);
 
+/**
+ * Function called to get the issuer of the attestation (as string)
+ *
+ * @param cls closure
+ * @param attest the attestation object
+ * @return corresponding issuer string
+ */
+typedef char *(*GNUNET_RECLAIM_AttestationGetIssuerFunction) (
+  void *cls,
+  const struct GNUNET_RECLAIM_Attestation *attest);
+
+/**
+ * Function called to get the expiration of the attestation
+ *
+ * @param cls closure
+ * @param attest the attestation object
+ * @param where to write the value
+ * @return GNUNET_OK if successful
+ */
+typedef int (*GNUNET_RECLAIM_AttestationGetExpirationFunction) (
+  void *cls,
+  const struct GNUNET_RECLAIM_Attestation *attest,
+  struct GNUNET_TIME_Absolute *expiration);
+
 
 
 /**
@@ -248,7 +271,15 @@ struct GNUNET_RECLAIM_AttestationPluginFunctions
    */
   GNUNET_RECLAIM_AttestationGetAttributesFunction get_attributes;
 
+  /**
+   * Attesation issuer.
+   */
+  GNUNET_RECLAIM_AttestationGetIssuerFunction get_issuer;
 
+  /**
+   * Expiration.
+   */
+  GNUNET_RECLAIM_AttestationGetExpirationFunction get_expiration;
 };
 
 
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h
index c63ed0100..813bc1a59 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -143,8 +143,7 @@ typedef void (*GNUNET_RECLAIM_AttributeTicketResult) (
  */
 typedef void (*GNUNET_RECLAIM_AttestationResult) (
   void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity,
-  const struct GNUNET_RECLAIM_Attestation *attestation,
-  const struct GNUNET_RECLAIM_AttributeList *attributes);
+  const struct GNUNET_RECLAIM_Attestation *attestation);
 
 
 /**