-introducing signing of regex accept states, removing PID from regex API

4 files changed, 37 insertions, 6 deletions

diff --git a/src/include/block_regex.h b/src/include/block_regex.h
index 73d7b70a5..be9d305ad 100644
--- a/src/include/block_regex.h
+++ b/src/include/block_regex.h
@@ -90,18 +90,34 @@ struct RegexBlock
 /**
  * @brief Block to announce a peer accepting a state.
  */
-struct RegexAccept
+struct RegexAcceptBlock
 {
+
+  /**
+   * Accept blocks must be signed.  Signature
+   * goes over expiration time and key.
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * When does the signature expire?
+   */
+  struct GNUNET_TIME_AbsoluteNBO expiration_time;
+
   /**
    * The key of the state.
    */
   struct GNUNET_HashCode key;
   
   /**
-   * The identity of the peer accepting the state
+   * Public key of the peer signing.
    */
-  struct GNUNET_PeerIdentity id;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
 
+  /**
+   * The signature.
+   */
+  struct GNUNET_CRYPTO_EccSignature signature;
 };
 
 
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index f10483424..e817c470f 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -94,6 +94,14 @@ extern "C"
 
 
 /**
+ * After how long do we expire an address in a HELLO that we just
+ * validated?  This value is also used for our own addresses when we
+ * create a HELLO.
+ */
+#define GNUNET_CONSTANTS_DHT_MAX_EXPIRATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 24)
+
+
+/**
  * Size of the 'struct EncryptedMessage' of the core (which
  * is the per-message overhead of the core).
  */
@@ -120,6 +128,7 @@ extern "C"
 
 
 
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif
diff --git a/src/include/gnunet_regex_service.h b/src/include/gnunet_regex_service.h
index 2a176f401..283aad5a1 100644
--- a/src/include/gnunet_regex_service.h
+++ b/src/include/gnunet_regex_service.h
@@ -56,7 +56,7 @@ struct GNUNET_REGEX_Search;
 
 
 /**
- * Announce the given peer under the given regular expression.  Does
+ * Announce this peer under the given regular expression.  Does
  * not free resources, must call GNUNET_REGEX_announce_cancel for
  * that.
  * 
@@ -70,7 +70,6 @@ struct GNUNET_REGEX_Search;
  */
 struct GNUNET_REGEX_Announcement *
 GNUNET_REGEX_announce (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                       const struct GNUNET_PeerIdentity *id,
                        const char *regex,
                        struct GNUNET_TIME_Relative refresh_delay,
                        uint16_t compression);
diff --git a/src/include/gnunet_signatures.h b/src/include/gnunet_signatures.h
index a821a74df..ced130a84 100644
--- a/src/include/gnunet_signatures.h
+++ b/src/include/gnunet_signatures.h
@@ -120,12 +120,19 @@ extern "C"
  */
 #define GNUNET_SIGNATURE_PURPOSE_SET_ECC_KEY 16
 
-
 /**
  * UBlock Signature, done using DSS, not ECC
  */
 #define GNUNET_SIGNATURE_PURPOSE_FS_UBLOCK 17
 
+/**
+ * Accept state in regex DFA.  Peer affirms that
+ * he offers the matching service.
+ */
+#define GNUNET_SIGNATURE_PURPOSE_REGEX_ACCEPT 18
+
+
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif