-conclude hello-uri implementation and test

3 files changed, 22 insertions, 6 deletions

diff --git a/src/include/gnunet_hello_uri_lib.h b/src/include/gnunet_hello_uri_lib.h
index dbf4dc35e..ec9cdfa5e 100644
--- a/src/include/gnunet_hello_uri_lib.h
+++ b/src/include/gnunet_hello_uri_lib.h
@@ -103,26 +103,30 @@ GNUNET_HELLO_builder_from_url (const char *url);
  * Generate HELLO message from a @a builder
  *
  * @param builder builder to serialize
+ * @param priv private key to use to sign the result
  * @return HELLO message matching @a builder
  */
 struct GNUNET_MQ_Envelope *
-GNUNET_HELLO_builder_to_env (struct GNUNET_HELLO_Builder *builder);
+GNUNET_HELLO_builder_to_env (const struct GNUNET_HELLO_Builder *builder,
+                             const struct GNUNET_CRYPTO_EddsaPrivateKey *priv);
 
 
 /**
  * Generate GNUnet HELLO URI from a @a builder
  *
  * @param builder builder to serialize
+ * @param priv private key to use to sign the result
  * @return hello URI
  */
 char *
-GNUNET_HELLO_builder_to_url (struct GNUNET_HELLO_Builder *builder);
-
+GNUNET_HELLO_builder_to_url (const struct GNUNET_HELLO_Builder *builder,
+                             const struct GNUNET_CRYPTO_EddsaPrivateKey *priv);
 
 /**
  * Generate DHT block from a @a builder
  *
  * @param builder the builder to serialize
+ * @param priv private key to use to sign the result
  * @param[out] block where to write the block, NULL to only calculate @a block_size
  * @param[in,out] block_size input is number of bytes available in @a block,
  *                           output is number of bytes needed in @a block
@@ -130,7 +134,8 @@ GNUNET_HELLO_builder_to_url (struct GNUNET_HELLO_Builder *builder);
  *      or if @a block was NULL
  */
 enum GNUNET_GenericReturnValue
-GNUNET_HELLO_builder_to_block (struct GNUNET_HELLO_Builder *builder,
+GNUNET_HELLO_builder_to_block (const struct GNUNET_HELLO_Builder *builder,
+                               const struct GNUNET_CRYPTO_EddsaPrivateKey *priv,
                                void *block,
                                size_t *block_size);
 
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h
index 09c547b09..bb8577b7a 100644
--- a/src/include/gnunet_strings_lib.h
+++ b/src/include/gnunet_strings_lib.h
@@ -458,7 +458,7 @@ GNUNET_STRINGS_base64url_decode (const char *data,
  *
  * @param data the data to encode
  * @param len the length of the input
- * @param output where to write the output (*output should be NULL,
+ * @param[out] out where to write the output (*output should be NULL,
  *   is allocated)
  * @return the size of the output
  */
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h
index b14439462..96413c3cc 100644
--- a/src/include/gnunet_time_lib.h
+++ b/src/include/gnunet_time_lib.h
@@ -762,11 +762,22 @@ GNUNET_TIME_absolute_from_s (uint64_t s_after_epoch);
  *
  * @param s_after_epoch seconds after epoch to convert
  * @return converted time value
- */struct GNUNET_TIME_Timestamp
+ */
+struct GNUNET_TIME_Timestamp
 GNUNET_TIME_timestamp_from_s (uint64_t s_after_epoch);
 
 
 /**
+ * Convert timestamp to number of seconds after the UNIX epoch.
+ *
+ * @param ts timestamp to convert
+ * @return converted time value
+ */
+uint64_t
+GNUNET_TIME_timestamp_to_s (struct GNUNET_TIME_Timestamp ts);
+
+
+/**
  * Convert absolute time from network byte order.
  *
  * @param a time to convert