RECLAIM: less unneccessary crypto; syntax and build fixes

1 files changed, 66 insertions, 102 deletions

diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index 27228c0bc..8b3a6b720 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -35,9 +35,8 @@
 #define GNUNET_GNSRECORD_LIB_H
 
 #ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
 }
 #endif
 #endif
@@ -125,7 +124,7 @@ extern "C"
 /**
  * Record type for reclaim records
  */
-#define GNUNET_GNSRECORD_TYPE_RECLAIM_AUTHZ 65550
+#define GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF 65550
 
 /**
  * Record type for RECLAIM master
@@ -145,8 +144,7 @@ extern "C"
 /**
  * Flags that can be set for a record.
  */
-enum GNUNET_GNSRECORD_Flags
-{
+enum GNUNET_GNSRECORD_Flags {
 
   /**
    * No special options.
@@ -177,17 +175,17 @@ enum GNUNET_GNSRECORD_Flags
    */
   GNUNET_GNSRECORD_RF_SHADOW_RECORD = 16
 
-  /**
-   * When comparing flags for record equality for removal,
-   * which flags should must match (in addition to the type,
-   * name, expiration value and data of the record)?  All flags
-   * that are not listed here will be ignored for this purpose.
-   * (for example, we don't expect that users will remember to
-   * pass the '--private' option when removing a record from
-   * the namestore, hence we don't require this particular option
-   * to match upon removal).  See also
-   * #GNUNET_GNSRECORD_records_cmp.
-   */
+/**
+ * When comparing flags for record equality for removal,
+ * which flags should must match (in addition to the type,
+ * name, expiration value and data of the record)?  All flags
+ * that are not listed here will be ignored for this purpose.
+ * (for example, we don't expect that users will remember to
+ * pass the '--private' option when removing a record from
+ * the namestore, hence we don't require this particular option
+ * to match upon removal).  See also
+ * #GNUNET_GNSRECORD_records_cmp.
+ */
 #define GNUNET_GNSRECORD_RF_RCMP_FLAGS (GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)
 };
 
@@ -195,8 +193,7 @@ enum GNUNET_GNSRECORD_Flags
 /**
  * A GNS record.
  */
-struct GNUNET_GNSRECORD_Data
-{
+struct GNUNET_GNSRECORD_Data {
 
   /**
    * Binary value stored in the DNS record.  Note: "data" must never
@@ -234,8 +231,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * Data stored in a PLACE record.
  */
-struct GNUNET_GNSRECORD_PlaceData
-{
+struct GNUNET_GNSRECORD_PlaceData {
   /**
    * Public key of the place.
    */
@@ -258,8 +254,7 @@ struct GNUNET_GNSRECORD_PlaceData
 /**
  * Information we have in an encrypted block with record data (i.e. in the DHT).
  */
-struct GNUNET_GNSRECORD_Block
-{
+struct GNUNET_GNSRECORD_Block {
 
   /**
    * Signature of the block.
@@ -296,8 +291,7 @@ struct GNUNET_GNSRECORD_Block
  * records do not require a separate network request, thus making TLSA
  * records inseparable from the "main" A/AAAA/VPN/etc. records.
  */
-struct GNUNET_GNSRECORD_BoxRecord
-{
+struct GNUNET_GNSRECORD_BoxRecord {
 
   /**
    * Protocol of the boxed record (6 = TCP, 17 = UDP, etc.).
@@ -316,7 +310,6 @@ struct GNUNET_GNSRECORD_BoxRecord
   uint32_t record_type GNUNET_PACKED;
 
   /* followed by the 'original' record */
-
 };
 
 /**
@@ -326,8 +319,7 @@ struct GNUNET_GNSRECORD_BoxRecord
  * the namespace the record belongs to.
  * It is exclusively found under the label ``+''.
  */
-struct GNUNET_GNSRECORD_ReverseRecord
-{
+struct GNUNET_GNSRECORD_ReverseRecord {
   /**
    * The public key of the namespace the is delegating to our namespace
    */
@@ -351,11 +343,8 @@ GNUNET_NETWORK_STRUCT_END
  * @param rd_count number of entries in @a rd array
  * @param rd array of records with data to store
  */
-typedef void
-(*GNUNET_GNSRECORD_RecordCallback) (void *cls,
-                                    unsigned int rd_count,
-                                    const struct GNUNET_GNSRECORD_Data *rd);
-
+typedef void (*GNUNET_GNSRECORD_RecordCallback) (
+    void *cls, unsigned int rd_count, const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /* ***************** API related to GNSRECORD plugins ************** */
@@ -369,10 +358,8 @@ typedef void
  * @param data_size number of bytes in @a data
  * @return NULL on error, otherwise human-readable representation of the value
  */
-char *
-GNUNET_GNSRECORD_value_to_string (uint32_t type,
-                                  const void *data,
-                                  size_t data_size);
+char *GNUNET_GNSRECORD_value_to_string (uint32_t type, const void *data,
+                                        size_t data_size);
 
 
 /**
@@ -385,11 +372,8 @@ GNUNET_GNSRECORD_value_to_string (uint32_t type,
  * @param data_size set to number of bytes in @a data
  * @return #GNUNET_OK on success
  */
-int
-GNUNET_GNSRECORD_string_to_value (uint32_t type,
-                                  const char *s,
-                                  void **data,
-                                  size_t *data_size);
+int GNUNET_GNSRECORD_string_to_value (uint32_t type, const char *s, void **data,
+                                      size_t *data_size);
 
 
 /**
@@ -398,8 +382,7 @@ GNUNET_GNSRECORD_string_to_value (uint32_t type,
  * @param dns_typename name to convert
  * @return corresponding number, UINT32_MAX on error
  */
-uint32_t
-GNUNET_GNSRECORD_typename_to_number (const char *dns_typename);
+uint32_t GNUNET_GNSRECORD_typename_to_number (const char *dns_typename);
 
 
 /**
@@ -408,8 +391,7 @@ GNUNET_GNSRECORD_typename_to_number (const char *dns_typename);
  * @param type number of a type to convert
  * @return corresponding typestring, NULL on error
  */
-const char *
-GNUNET_GNSRECORD_number_to_typename (uint32_t type);
+const char *GNUNET_GNSRECORD_number_to_typename (uint32_t type);
 
 
 /* convenience APIs for serializing / deserializing GNS records */
@@ -424,7 +406,7 @@ GNUNET_GNSRECORD_number_to_typename (uint32_t type);
  */
 ssize_t
 GNUNET_GNSRECORD_records_get_size (unsigned int rd_count,
-                                   const struct GNUNET_GNSRECORD_Data *rd);
+                                   const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
@@ -438,9 +420,8 @@ GNUNET_GNSRECORD_records_get_size (unsigned int rd_count,
  */
 ssize_t
 GNUNET_GNSRECORD_records_serialize (unsigned int rd_count,
-                                    const struct GNUNET_GNSRECORD_Data *rd,
-                                    size_t dest_size,
-                                    char *dest);
+                                    const struct GNUNET_GNSRECORD_Data *rd,
+                                    size_t dest_size, char *dest);
 
 
 /**
@@ -452,17 +433,14 @@ GNUNET_GNSRECORD_records_serialize (unsigned int rd_count,
  * @param dest where to put the data
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
-int
-GNUNET_GNSRECORD_records_deserialize (size_t len,
-                                      const char *src,
-                                      unsigned int rd_count,
-                                      struct GNUNET_GNSRECORD_Data *dest);
+int GNUNET_GNSRECORD_records_deserialize (size_t len, const char *src,
+                                          unsigned int rd_count,
+                                          struct GNUNET_GNSRECORD_Data *dest);
 
 
 /* ******* general APIs relating to blocks, records and labels ******** */
 
 
-
 /**
  * Test if a given record is expired.
  *
@@ -470,8 +448,7 @@ GNUNET_GNSRECORD_records_deserialize (size_t len,
  * @return #GNUNET_YES if the record is expired,
  *         #GNUNET_NO if not
  */
-int
-GNUNET_GNSRECORD_is_expired (const struct GNUNET_GNSRECORD_Data *rd);
+int GNUNET_GNSRECORD_is_expired (const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
@@ -479,8 +456,7 @@ GNUNET_GNSRECORD_is_expired (const struct GNUNET_GNSRECORD_Data *rd);
  * @param src source string
  * @return converted result
  */
-char *
-GNUNET_GNSRECORD_string_to_lowercase (const char *src);
+char *GNUNET_GNSRECORD_string_to_lowercase (const char *src);
 
 
 /**
@@ -489,10 +465,10 @@ GNUNET_GNSRECORD_string_to_lowercase (const char *src);
  * NOT reentrant!
  *
  * @param z public key of a zone
- * @return string form; will be overwritten by next call to #GNUNET_GNSRECORD_z2s.
+ * @return string form; will be overwritten by next call to
+ * #GNUNET_GNSRECORD_z2s.
  */
-const char *
-GNUNET_GNSRECORD_z2s (const struct GNUNET_CRYPTO_EcdsaPublicKey *z);
+const char *GNUNET_GNSRECORD_z2s (const struct GNUNET_CRYPTO_EcdsaPublicKey *z);
 
 
 /**
@@ -518,9 +494,8 @@ GNUNET_GNSRECORD_pkey_to_zkey (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
  * @param pkey set to a public key on the eliptic curve
  * @return #GNUNET_SYSERR if @a zkey has the wrong syntax
  */
-int
-GNUNET_GNSRECORD_zkey_to_pkey (const char *zkey,
-                               struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
+int GNUNET_GNSRECORD_zkey_to_pkey (const char *zkey,
+                                   struct GNUNET_CRYPTO_EcdsaPublicKey *pkey);
 
 
 /**
@@ -530,10 +505,9 @@ GNUNET_GNSRECORD_zkey_to_pkey (const char *zkey,
  * @param label label of the record
  * @param query hash to use for the query
  */
-void
-GNUNET_GNSRECORD_query_from_private_key (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-                                         const char *label,
-                                         struct GNUNET_HashCode *query);
+void GNUNET_GNSRECORD_query_from_private_key (
+    const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, const char *label,
+    struct GNUNET_HashCode *query);
 
 
 /**
@@ -543,10 +517,9 @@ GNUNET_GNSRECORD_query_from_private_key (const struct GNUNET_CRYPTO_EcdsaPrivate
  * @param label label of the record
  * @param query hash to use for the query
  */
-void
-GNUNET_GNSRECORD_query_from_public_key (const struct GNUNET_CRYPTO_EcdsaPublicKey *pub,
-                                        const char *label,
-                                        struct GNUNET_HashCode *query);
+void GNUNET_GNSRECORD_query_from_public_key (
+    const struct GNUNET_CRYPTO_EcdsaPublicKey *pub, const char *label,
+    struct GNUNET_HashCode *query);
 
 
 /**
@@ -558,12 +531,10 @@ GNUNET_GNSRECORD_query_from_public_key (const struct GNUNET_CRYPTO_EcdsaPublicKe
  * @param rd record data
  * @param rd_count number of records in @a rd
  */
-struct GNUNET_GNSRECORD_Block *
-GNUNET_GNSRECORD_block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
-                               struct GNUNET_TIME_Absolute expire,
-                               const char *label,
-                               const struct GNUNET_GNSRECORD_Data *rd,
-                               unsigned int rd_count);
+struct GNUNET_GNSRECORD_Block *GNUNET_GNSRECORD_block_create (
+    const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
+    struct GNUNET_TIME_Absolute expire, const char *label,
+    const struct GNUNET_GNSRECORD_Data *rd, unsigned int rd_count);
 
 
 /**
@@ -577,12 +548,10 @@ GNUNET_GNSRECORD_block_create (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
  * @param rd record data
  * @param rd_count number of records in @a rd
  */
-struct GNUNET_GNSRECORD_Block *
-GNUNET_GNSRECORD_block_create2 (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
-                                struct GNUNET_TIME_Absolute expire,
-                                const char *label,
-                                const struct GNUNET_GNSRECORD_Data *rd,
-                                unsigned int rd_count);
+struct GNUNET_GNSRECORD_Block *GNUNET_GNSRECORD_block_create2 (
+    const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
+    struct GNUNET_TIME_Absolute expire, const char *label,
+    const struct GNUNET_GNSRECORD_Data *rd, unsigned int rd_count);
 
 
 /**
@@ -592,8 +561,7 @@ GNUNET_GNSRECORD_block_create2 (const struct GNUNET_CRYPTO_EcdsaPrivateKey *key,
  * @param block block to verify
  * @return #GNUNET_OK if the signature is valid
  */
-int
-GNUNET_GNSRECORD_block_verify (const struct GNUNET_GNSRECORD_Block *block);
+int GNUNET_GNSRECORD_block_verify (const struct GNUNET_GNSRECORD_Block *block);
 
 
 /**
@@ -607,12 +575,10 @@ GNUNET_GNSRECORD_block_verify (const struct GNUNET_GNSRECORD_Block *block);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if the block was
  *        not well-formed
  */
-int
-GNUNET_GNSRECORD_block_decrypt (const struct GNUNET_GNSRECORD_Block *block,
-                                const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key,
-                                const char *label,
-                                GNUNET_GNSRECORD_RecordCallback proc,
-                                void *proc_cls);
+int GNUNET_GNSRECORD_block_decrypt (
+    const struct GNUNET_GNSRECORD_Block *block,
+    const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key, const char *label,
+    GNUNET_GNSRECORD_RecordCallback proc, void *proc_cls);
 
 
 /**
@@ -622,9 +588,8 @@ GNUNET_GNSRECORD_block_decrypt (const struct GNUNET_GNSRECORD_Block *block,
  * @param b another record
  * @return #GNUNET_YES if the records are equal, or #GNUNET_NO if not.
  */
-int
-GNUNET_GNSRECORD_records_cmp (const struct GNUNET_GNSRECORD_Data *a,
-                              const struct GNUNET_GNSRECORD_Data *b);
+int GNUNET_GNSRECORD_records_cmp (const struct GNUNET_GNSRECORD_Data *a,
+                                  const struct GNUNET_GNSRECORD_Data *b);
 
 
 /**
@@ -636,12 +601,11 @@ GNUNET_GNSRECORD_records_cmp (const struct GNUNET_GNSRECORD_Data *a,
  * @param rd array of records
  * @return absolute expiration time
  */
-struct GNUNET_TIME_Absolute
-GNUNET_GNSRECORD_record_get_expiration_time (unsigned int rd_count,
-                                             const struct GNUNET_GNSRECORD_Data *rd);
+struct GNUNET_TIME_Absolute GNUNET_GNSRECORD_record_get_expiration_time (
+    unsigned int rd_count, const struct GNUNET_GNSRECORD_Data *rd);
 
 
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0 /* keep Emacsens' auto-indent happy */
 {
 #endif
 #ifdef __cplusplus
@@ -650,4 +614,4 @@ GNUNET_GNSRECORD_record_get_expiration_time (unsigned int rd_count,
 
 #endif
 
-/** @} */  /* end of group */
+/** @} */ /* end of group */