1 files changed, 72 insertions, 10 deletions

diff --git a/src/reclaim/reclaim.h b/src/reclaim/reclaim.h
index ff953a096..7b5d7ab19 100644
--- a/src/reclaim/reclaim.h
+++ b/src/reclaim/reclaim.h
@@ -139,6 +139,11 @@ struct AttributeResultMessage
   uint16_t attr_len GNUNET_PACKED;
 
   /**
+   * Length of serialized attestation data
+   */
+  uint16_t attestation_len GNUNET_PACKED;
+
+  /**
    * always zero (for alignment)
    */
   uint16_t reserved GNUNET_PACKED;
@@ -154,9 +159,9 @@ struct AttributeResultMessage
 };
 
 /**
- * Reference plus Attestation is returned from the idp.
+ * Attestation is returned from the idp.
  */
-struct ReferenceResultMessage
+struct AttestationResultMessage
 {
   /**
    * Message header
@@ -169,14 +174,9 @@ struct ReferenceResultMessage
   uint32_t id GNUNET_PACKED;
 
   /**
-   * Length of serialized attestation data
-   */
-  uint16_t attest_len GNUNET_PACKED;
-
-  /**
-   * Length of serialized reference data
+   * Length of serialized attribute data
    */
-  uint16_t ref_len GNUNET_PACKED;
+  uint16_t attestation_len GNUNET_PACKED;
 
   /**
    * always zero (for alignment)
@@ -189,10 +189,11 @@ struct ReferenceResultMessage
   struct GNUNET_CRYPTO_EcdsaPublicKey identity;
 
   /* followed by:
-   * serialized reference data + attestation data
+   * serialized attestation data
    */
 };
 
+
 /**
  * Start a attribute iteration for the given identity
  */
@@ -233,6 +234,62 @@ struct AttributeIterationNextMessage
 
 
 /**
+ * Start a attestation iteration for the given identity
+ */
+struct AttestationIterationStartMessage
+{
+  /**
+   * Message
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Unique identifier for this request (for key collisions).
+   */
+  uint32_t id GNUNET_PACKED;
+
+  /**
+   * Identity.
+   */
+  struct GNUNET_CRYPTO_EcdsaPrivateKey identity;
+};
+
+
+/**
+ * Ask for next result of attestation iteration for the given operation
+ */
+struct AttestationIterationNextMessage
+{
+  /**
+   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Unique identifier for this request (for key collisions).
+   */
+  uint32_t id GNUNET_PACKED;
+};
+
+
+/**
+ * Stop attestation iteration for the given operation
+ */
+struct AttestationIterationStopMessage
+{
+  /**
+   * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Unique identifier for this request (for key collisions).
+   */
+  uint32_t id GNUNET_PACKED;
+};
+
+
+/**
  * Stop attribute iteration for the given operation
  */
 struct AttributeIterationStopMessage
@@ -463,6 +520,11 @@ struct ConsumeTicketResultMessage
   uint16_t attrs_len GNUNET_PACKED;
 
   /**
+   * Length of attestation data
+   */
+  uint16_t attestations_len;
+
+  /**
    * always zero (for alignment)
    */
   uint16_t reserved GNUNET_PACKED;