refactor DHT for new service API

[oweals/gnunet.git] / src / revocation / revocation.h

diff --git a/src/revocation/revocation.h b/src/revocation/revocation.h
index aa15fd44a128a57465eaba310c8c6dd98f430f79..56ed9555aedd9ca9fd077633b5b9cf3da9c7d738 100644 (file)
--- a/src/revocation/revocation.h
+++ b/src/revocation/revocation.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -33,7 +33,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * Query key revocation status.
  */
-struct GNUNET_REVOCATION_QueryMessage
+struct QueryMessage
 {
   /**
    * Type: #GNUNET_MESSAGE_TYPE_REVOCATION_QUERY
@@ -48,7 +48,7 @@ struct GNUNET_REVOCATION_QueryMessage
   /**
    * Key to check.
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey key GNUNET_PACKED;
+  struct GNUNET_CRYPTO_EcdsaPublicKey key;
 
 };
 
@@ -56,7 +56,7 @@ struct GNUNET_REVOCATION_QueryMessage
 /**
  * Key revocation response.
  */
-struct GNUNET_REVOCATION_QueryResponseMessage
+struct QueryResponseMessage
 {
   /**
    * Type: #GNUNET_MESSAGE_TYPE_REVOCATION_QUERY_RESPONSE
@@ -78,7 +78,7 @@ struct GNUNET_REVOCATION_QueryResponseMessage
  * #GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE_RESPONSE (which is just
  * in a `struct GNUNET_MessageHeader`.
  */
-struct GNUNET_REVOCATION_RevokeMessage
+struct RevokeMessage
 {
   /**
    * Type: #GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE
@@ -90,26 +90,44 @@ struct GNUNET_REVOCATION_RevokeMessage
    */
   uint32_t reserved GNUNET_PACKED;
 
+  /**
+   * Number that causes a hash collision with the @e public_key.
+   */
+  uint64_t proof_of_work GNUNET_PACKED;
+
   /**
    * Signature confirming revocation.
    */
-  struct GNUNET_CRYPTO_EccSignature signature  GNUNET_PACKED;
+  struct GNUNET_CRYPTO_EcdsaSignature signature;
 
   /**
    * Must have purpose #GNUNET_SIGNATURE_PURPOSE_REVOCATION,
-   * size expands over the key and the proof of work.
+   * size expands over the public key.
    */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose GNUNET_PACKED;
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
   /**
    * Key to revoke.
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey public_key GNUNET_PACKED;
+  struct GNUNET_CRYPTO_EcdsaPublicKey public_key;
+
+};
+
+
+/**
+ * Key revocation response.
+ */
+struct RevocationResponseMessage
+{
+  /**
+   * Type: #GNUNET_MESSAGE_TYPE_REVOCATION_REVOKE_RESPONSE
+   */
+  struct GNUNET_MessageHeader header;
 
   /**
-   * Number that causes a hash collision with the @e public_key.
+   * #GNUNET_NO if revoked, #GNUNET_YES if valid.
    */
-  uint64_t proof_of_work GNUNET_PACKED;
+  uint32_t is_valid GNUNET_PACKED;
 
 };