1 files changed, 326 insertions, 86 deletions

diff --git a/src/include/gnunet_reclaim_lib.h b/src/include/gnunet_reclaim_lib.h
index 4f2d6dba5..bbf1c3ad3 100644
--- a/src/include/gnunet_reclaim_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
@@ -39,32 +39,41 @@ extern "C" {
 
 #include "gnunet_util_lib.h"
 
+enum GNUNET_RECLAIM_AttributeType {
+  /**
+   * No value attribute.
+   */
+  GNUNET_RECLAIM_ATTRIBUTE_TYPE_NONE = 0,
 
-/**
- * No value attribute.
- */
-#define GNUNET_RECLAIM_ATTRIBUTE_TYPE_NONE 0
+  /**
+   * String attribute.
+   */
+  GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING = 1
+};
 
-/**
- * String attribute.
- */
-#define GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING 1
+enum GNUNET_RECLAIM_CredentialType {
+  /**
+   * No value credential.
+   */
+  GNUNET_RECLAIM_CREDENTIAL_TYPE_NONE = 0,
 
-/**
-* No value attestation.
-*/
-#define GNUNET_RECLAIM_ATTESTATION_TYPE_NONE 10
+  /**
+   * A JSON Web Token credential.
+   */
+  GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT = 1,
 
-/**
-* A JSON Web Token attestation.
-*/
-#define GNUNET_RECLAIM_ATTESTATION_TYPE_JWT 11
+  /**
+   * libpabc credential
+   */
+  GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC = 2
+};
 
 /**
  * We want an ID to be a 256-bit symmetric key
  */
 #define GNUNET_RECLAIM_ID_LENGTH (256 / 8)
 
+GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * A reclaim identifier
  * FIXME maybe put this in a different namespace
@@ -74,6 +83,8 @@ struct GNUNET_RECLAIM_Identifier
   char id[GNUNET_RECLAIM_ID_LENGTH];
 };
 
+GNUNET_NETWORK_STRUCT_END
+
 static const struct GNUNET_RECLAIM_Identifier GNUNET_RECLAIM_ID_ZERO;
 
 #define GNUNET_RECLAIM_id_is_equal(a,b) ((0 == \
@@ -104,9 +115,10 @@ struct GNUNET_RECLAIM_Attribute
   struct GNUNET_RECLAIM_Identifier id;
 
   /**
-   * Referenced ID of Attestation (may be 0 if self-attested)
+   * Referenced ID of credential
+   * (may be GNUNET_RECLAIM_ID_ZERO if self-creded)
    */
-  struct GNUNET_RECLAIM_Identifier attestation;
+  struct GNUNET_RECLAIM_Identifier credential;
 
   /**
    * Type of Claim
@@ -138,9 +150,9 @@ struct GNUNET_RECLAIM_Attribute
 };
 
 /**
- * An attestation.
+ * A credential.
  */
-struct GNUNET_RECLAIM_Attestation
+struct GNUNET_RECLAIM_Credential
 {
   /**
    * ID
@@ -158,7 +170,7 @@ struct GNUNET_RECLAIM_Attestation
   uint32_t flag;
 
   /**
-   * The name of the attribute. Note "name" must never be individually
+   * The name of the credential. Note: must never be individually
    * free'd
    */
   const char *name;
@@ -169,7 +181,36 @@ struct GNUNET_RECLAIM_Attestation
   size_t data_size;
 
   /**
-   * Binary value stored as attribute value.  Note: "data" must never
+   * Binary value stored as credential value.  Note: "data" must never
+   * be individually 'malloc'ed, but instead always points into some
+   * existing data area.
+   */
+  const void *data;
+};
+
+
+/**
+ * A credential presentation.
+ */
+struct GNUNET_RECLAIM_Presentation
+{
+  /**
+   * The credential id of which this is a presentation.
+   */
+  struct GNUNET_RECLAIM_Identifier credential_id;
+
+  /**
+   * Type/Format of Claim
+   */
+  uint32_t type;
+
+  /**
+   * Number of bytes in @e data.
+   */
+  size_t data_size;
+
+  /**
+   * Binary value stored as presentation value.  Note: "data" must never
    * be individually 'malloc'ed, but instead always points into some
    * existing data area.
    */
@@ -177,6 +218,7 @@ struct GNUNET_RECLAIM_Attestation
 };
 
 
+
 /**
  * A list of GNUNET_RECLAIM_Attribute structures.
  */
@@ -214,56 +256,94 @@ struct GNUNET_RECLAIM_AttributeListEntry
 };
 
 /**
- * A list of GNUNET_RECLAIM_Attestation structures.
+ * A list of GNUNET_RECLAIM_Credential structures.
+ */
+struct GNUNET_RECLAIM_CredentialList
+{
+  /**
+   * List head
+   */
+  struct GNUNET_RECLAIM_CredentialListEntry *list_head;
+
+  /**
+   * List tail
+   */
+  struct GNUNET_RECLAIM_CredentialListEntry *list_tail;
+};
+
+
+struct GNUNET_RECLAIM_CredentialListEntry
+{
+  /**
+   * DLL
+   */
+  struct GNUNET_RECLAIM_CredentialListEntry *prev;
+
+  /**
+   * DLL
+   */
+  struct GNUNET_RECLAIM_CredentialListEntry *next;
+
+  /**
+   * The credential
+   */
+  struct GNUNET_RECLAIM_Credential *credential;
+
+};
+
+
+/**
+ * A list of GNUNET_RECLAIM_Presentation structures.
  */
-struct GNUNET_RECLAIM_AttestationList
+struct GNUNET_RECLAIM_PresentationList
 {
   /**
    * List head
    */
-  struct GNUNET_RECLAIM_AttestationListEntry *list_head;
+  struct GNUNET_RECLAIM_PresentationListEntry *list_head;
 
   /**
    * List tail
    */
-  struct GNUNET_RECLAIM_AttestationListEntry *list_tail;
+  struct GNUNET_RECLAIM_PresentationListEntry *list_tail;
 };
 
 
-struct GNUNET_RECLAIM_AttestationListEntry
+struct GNUNET_RECLAIM_PresentationListEntry
 {
   /**
    * DLL
    */
-  struct GNUNET_RECLAIM_AttestationListEntry *prev;
+  struct GNUNET_RECLAIM_PresentationListEntry *prev;
 
   /**
    * DLL
    */
-  struct GNUNET_RECLAIM_AttestationListEntry *next;
+  struct GNUNET_RECLAIM_PresentationListEntry *next;
 
   /**
-   * The attestation
+   * The credential
    */
-  struct GNUNET_RECLAIM_Attestation *attestation;
+  struct GNUNET_RECLAIM_Presentation *presentation;
 
 };
 
 
+
 /**
  * Create a new attribute claim.
  *
  * @param attr_name the attribute name
- * @param attestation ID of the attestation (may be NULL)
+ * @param credential ID of the credential (may be NULL)
  * @param type the attribute type
- * @param data the attribute value. Must be the mapped name if attestation not NULL
+ * @param data the attribute value. Must be #attr_name if credential not NULL
  * @param data_size the attribute value size
  * @return the new attribute
  */
 struct GNUNET_RECLAIM_Attribute *
 GNUNET_RECLAIM_attribute_new (const char *attr_name,
                               const struct
-                              GNUNET_RECLAIM_Identifier *attestation,
+                              GNUNET_RECLAIM_Identifier *credential,
                               uint32_t type,
                               const void *data,
                               size_t data_size);
@@ -295,7 +375,7 @@ GNUNET_RECLAIM_attribute_list_destroy (
  *
  * @param attrs the attribute list to add to
  * @param attr_name the name of the new attribute claim
- * @param attestation attestation ID (may be NULL)
+ * @param credential credential ID (may be NULL)
  * @param type the type of the claim
  * @param data claim payload
  * @param data_size claim payload size
@@ -304,7 +384,7 @@ void
 GNUNET_RECLAIM_attribute_list_add (
   struct GNUNET_RECLAIM_AttributeList *attrs,
   const char *attr_name,
-  const struct GNUNET_RECLAIM_Identifier *attestation,
+  const struct GNUNET_RECLAIM_Identifier *credential,
   uint32_t type,
   const void *data,
   size_t data_size);
@@ -361,11 +441,13 @@ GNUNET_RECLAIM_attribute_serialize (const struct GNUNET_RECLAIM_Attribute *attr,
  *
  * @param data the serialized attribute
  * @param data_size the length of the serialized data
+ * @param attr deserialized attribute. Will be allocated. Must be free'd
  *
- * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller
+ * @return number of bytes read or -1 for error
  */
-struct GNUNET_RECLAIM_Attribute *
-GNUNET_RECLAIM_attribute_deserialize (const char *data, size_t data_size);
+ssize_t
+GNUNET_RECLAIM_attribute_deserialize (const char *data, size_t data_size,
+                                      struct GNUNET_RECLAIM_Attribute **attr);
 
 
 /**
@@ -434,8 +516,8 @@ GNUNET_RECLAIM_attribute_number_to_typename (uint32_t type);
  * @return the required buffer size
  */
 size_t
-GNUNET_RECLAIM_attestation_list_serialize_get_size (
-  const struct GNUNET_RECLAIM_AttestationList *attestations);
+GNUNET_RECLAIM_credential_list_serialize_get_size (
+  const struct GNUNET_RECLAIM_CredentialList *credentials);
 
 
 /**
@@ -444,8 +526,8 @@ GNUNET_RECLAIM_attestation_list_serialize_get_size (
  * @param attrs list to destroy
  */
 void
-GNUNET_RECLAIM_attestation_list_destroy (
-  struct GNUNET_RECLAIM_AttestationList *attestations);
+GNUNET_RECLAIM_credential_list_destroy (
+  struct GNUNET_RECLAIM_CredentialList *credentials);
 
 
 /**
@@ -457,8 +539,8 @@ GNUNET_RECLAIM_attestation_list_destroy (
  * @param data_size claim payload size
  */
 void
-GNUNET_RECLAIM_attestation_list_add (
-  struct GNUNET_RECLAIM_AttestationList *attrs,
+GNUNET_RECLAIM_credential_list_add (
+  struct GNUNET_RECLAIM_CredentialList *attrs,
   const char *att_name,
   uint32_t type,
   const void *data,
@@ -473,8 +555,8 @@ GNUNET_RECLAIM_attestation_list_add (
  * @return length of serialized data
  */
 size_t
-GNUNET_RECLAIM_attestation_list_serialize (
-  const struct GNUNET_RECLAIM_AttestationList *attrs,
+GNUNET_RECLAIM_credential_list_serialize (
+  const struct GNUNET_RECLAIM_CredentialList *attrs,
   char *result);
 
 
@@ -485,75 +567,75 @@ GNUNET_RECLAIM_attestation_list_serialize (
  * @param data_size the length of the serialized data
  * @return a GNUNET_IDENTITY_PROVIDER_AttributeList, must be free'd by caller
  */
-struct GNUNET_RECLAIM_AttestationList *
-GNUNET_RECLAIM_attestation_list_deserialize (const char *data,
+struct GNUNET_RECLAIM_CredentialList *
+GNUNET_RECLAIM_credential_list_deserialize (const char *data,
                                              size_t data_size);
 
 
 /**
-   * @param attestation the attestation to serialize
+   * @param credential the credential to serialize
    * @return the required buffer size
    */
 size_t
-GNUNET_RECLAIM_attestation_serialize_get_size (
-  const struct GNUNET_RECLAIM_Attestation *attestation);
+GNUNET_RECLAIM_credential_serialize_get_size (
+  const struct GNUNET_RECLAIM_Credential *credential);
 
 
 /**
- * Serialize an attestation
+ * Serialize an credential
  *
- * @param attestation the attestation to serialize
- * @param result the serialized attestation
+ * @param credential the credential to serialize
+ * @param result the serialized credential
  * @return length of serialized data
  */
 size_t
-GNUNET_RECLAIM_attestation_serialize (
-  const struct GNUNET_RECLAIM_Attestation *attestation,
+GNUNET_RECLAIM_credential_serialize (
+  const struct GNUNET_RECLAIM_Credential *credential,
   char *result);
 
 
 /**
- * Deserialize an attestation
+ * Deserialize an credential
  *
- * @param data the serialized attestation
+ * @param data the serialized credential
  * @param data_size the length of the serialized data
  *
  * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller
  */
-struct GNUNET_RECLAIM_Attestation *
-GNUNET_RECLAIM_attestation_deserialize (const char *data, size_t data_size);
+struct GNUNET_RECLAIM_Credential *
+GNUNET_RECLAIM_credential_deserialize (const char *data, size_t data_size);
 
 
 /**
- * Create a new attestation.
+ * Create a new credential.
  *
- * @param name the attestation name
- * @param type the attestation type
- * @param data the attestation value
- * @param data_size the attestation value size
- * @return the new attestation
- */
-struct GNUNET_RECLAIM_Attestation *
-GNUNET_RECLAIM_attestation_new (const char *name,
+ * @param 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 *name,
                                 uint32_t type,
                                 const void *data,
                                 size_t data_size);
 
 /**
- * Convert the 'claim' of an attestation to a string
+ * Convert the 'claim' of an credential to a string
  *
- * @param type the type of attestation
+ * @param type the type of credential
  * @param data claim in binary encoding
  * @param data_size number of bytes in @a data
  * @return NULL on error, otherwise human-readable representation of the claim
  */
 char *
-GNUNET_RECLAIM_attestation_value_to_string (uint32_t type,
+GNUNET_RECLAIM_credential_value_to_string (uint32_t type,
                                             const void *data,
                                             size_t data_size);
 
 /**
- * Convert human-readable version of a 'claim' of an attestation to the binary
+ * Convert human-readable version of a 'claim' of an credential to the binary
  * representation
  *
  * @param type type of the claim
@@ -563,48 +645,206 @@ GNUNET_RECLAIM_attestation_value_to_string (uint32_t type,
  * @return #GNUNET_OK on success
  */
 int
-GNUNET_RECLAIM_attestation_string_to_value (uint32_t type,
+GNUNET_RECLAIM_credential_string_to_value (uint32_t type,
                                             const char *s,
                                             void **data,
                                             size_t *data_size);
 
 /**
- * Convert an attestation type number to the corresponding attestation type string
+ * Convert an credential type number to the corresponding credential type string
  *
  * @param type number of a type
  * @return corresponding typestring, NULL on error
  */
 const char *
-GNUNET_RECLAIM_attestation_number_to_typename (uint32_t type);
+GNUNET_RECLAIM_credential_number_to_typename (uint32_t type);
 
 /**
- * Convert an attestation type name to the corresponding number
+ * Convert an credential type name to the corresponding number
  *
  * @param typename name to convert
  * @return corresponding number, UINT32_MAX on error
  */
 uint32_t
-GNUNET_RECLAIM_attestation_typename_to_number (const char *typename);
+GNUNET_RECLAIM_credential_typename_to_number (const char *typename);
 
 /**
- * Convert an attestation type name to the corresponding number
+ * Convert an credential type name to the corresponding number
  *
  * @param typename name to convert
  * @return corresponding number, UINT32_MAX on error
  */
 struct GNUNET_RECLAIM_AttributeList*
-GNUNET_RECLAIM_attestation_get_attributes (const struct
-                                           GNUNET_RECLAIM_Attestation *attest);
+GNUNET_RECLAIM_credential_get_attributes (const struct
+                                           GNUNET_RECLAIM_Credential *cred);
+
+char*
+GNUNET_RECLAIM_credential_get_issuer (const struct
+                                       GNUNET_RECLAIM_Credential *cred);
+
+int
+GNUNET_RECLAIM_credential_get_expiration (const struct
+                                           GNUNET_RECLAIM_Credential *cred,
+                                           struct GNUNET_TIME_Absolute *exp);
+
+/**
+ * Get required size for serialization buffer
+ *
+ * @param presentations the presentation list to serialize
+ * @return the required buffer size
+ */
+size_t
+GNUNET_RECLAIM_presentation_list_serialize_get_size (
+  const struct GNUNET_RECLAIM_PresentationList *presentations);
+
+
+/**
+ * Destroy presentations list
+ *
+ * @param presentations list to destroy
+ */
+void
+GNUNET_RECLAIM_presentation_list_destroy (
+  struct GNUNET_RECLAIM_PresentationList *presentations);
+
+
+/**
+ * Serialize a presentation list
+ *
+ * @param presentations the attribute list to serialize
+ * @param result the serialized list
+ * @return length of serialized data
+ */
+size_t
+GNUNET_RECLAIM_presentation_list_serialize (
+  const struct GNUNET_RECLAIM_PresentationList *presentations,
+  char *result);
+
+
+/**
+ * Deserialize a presentation list
+ *
+ * @param data the serialized list
+ * @param data_size the length of the serialized data
+ * @return a GNUNET_RECLAIM_PresentationList, must be free'd by caller
+ */
+struct GNUNET_RECLAIM_PresentationList *
+GNUNET_RECLAIM_presentation_list_deserialize (const char *data,
+                                              size_t data_size);
+
+
+/**
+ * @param presentation the presentation to serialize
+ * @return the required buffer size
+ */
+size_t
+GNUNET_RECLAIM_presentation_serialize_get_size (
+  const struct GNUNET_RECLAIM_Presentation *presentation);
+
+
+/**
+ * Serialize a presentation.
+ *
+ * @param presentation 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,
+  char *result);
+
+
+/**
+ * Deserialize a presentation
+ *
+ * @param data the serialized presentation
+ * @param data_size the length of the serialized data
+ *
+ * @return a GNUNET_RECLAIM_Presentation, must be free'd by caller
+ */
+struct GNUNET_RECLAIM_Presentation *
+GNUNET_RECLAIM_presentation_deserialize (const char *data, size_t data_size);
+
+
+/**
+ * Convert the 'claim' of a presentation to a string
+ *
+ * @param type the type of presentation
+ * @param data presentation in binary encoding
+ * @param data_size number of bytes in @a data
+ * @return NULL on error, otherwise human-readable representation of the claim
+ */
+char *
+GNUNET_RECLAIM_presentation_value_to_string (uint32_t type,
+                                             const void *data,
+                                             size_t data_size);
+
+struct GNUNET_RECLAIM_Presentation *
+GNUNET_RECLAIM_presentation_new (uint32_t type,
+                                 const void *data,
+                                 size_t data_size);
+
+/**
+ * Convert human-readable version of a 'claim' of a presentation to the binary
+ * representation
+ *
+ * @param type type of the presentation
+ * @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
+ */
+int
+GNUNET_RECLAIM_presentation_string_to_value (uint32_t type,
+                                             const char *s,
+                                             void **data,
+                                             size_t *data_size);
+
+/**
+ * Convert a presentation type number to the corresponding credential 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);
+
+struct GNUNET_RECLAIM_AttributeList*
+GNUNET_RECLAIM_presentation_get_attributes (const struct
+                                           GNUNET_RECLAIM_Presentation *cred);
 
 char*
-GNUNET_RECLAIM_attestation_get_issuer (const struct
-                                       GNUNET_RECLAIM_Attestation *attest);
+GNUNET_RECLAIM_presentation_get_issuer (const struct
+                                       GNUNET_RECLAIM_Presentation *cred);
 
 int
-GNUNET_RECLAIM_attestation_get_expiration (const struct
-                                           GNUNET_RECLAIM_Attestation *attest,
+GNUNET_RECLAIM_presentation_get_expiration (const struct
+                                           GNUNET_RECLAIM_Presentation *cred,
                                            struct GNUNET_TIME_Absolute *exp);
 
+
+
+/**
+ * Create a presentation from a credential and a lift of (selected)
+ * attributes in the credential.
+ * FIXME not yet implemented
+ *
+ * @param cred the credential to use
+ * @param attrs the attributes to present from the credential
+ * @param presentation the credential presentation presenting the attributes according
+ *         to the presentation mechanism of the credential
+ *         or NULL on error.
+ * @return GNUNET_OK on success.
+ */
+int
+GNUNET_RECLAIM_credential_get_presentation (
+                              const struct GNUNET_RECLAIM_Credential *cred,
+                              const struct GNUNET_RECLAIM_AttributeList *attrs,
+                              struct GNUNET_RECLAIM_Presentation **presentation);
+
+
 #if 0 /* keep Emacsens' auto-indent happy */
 {
 #endif