-switching GNS from RSA to ECC

7 files changed, 24 insertions, 21 deletions

diff --git a/src/include/block_dns.h b/src/include/block_dns.h
index 0ca5a47a5..c7e1fbb55 100644
--- a/src/include/block_dns.h
+++ b/src/include/block_dns.h
@@ -47,18 +47,18 @@ struct GNUNET_DNS_Record
   /**
    * Signature of the peer affirming that he is offering the service.
    */
-  struct GNUNET_CRYPTO_RsaSignature signature;
+  struct GNUNET_CRYPTO_EccSignature signature;
 
   /**
    * Beginning of signed portion of the record, signs everything until
    * the end of the struct.
    */
-  struct GNUNET_CRYPTO_RsaSignaturePurpose purpose;
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
   /**
    * The peer providing this service
    */
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded peer;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded peer;
 
   /**
    * The descriptor for the service
diff --git a/src/include/block_gns.h b/src/include/block_gns.h
index 7b4ceed18..2f864f4d3 100644
--- a/src/include/block_gns.h
+++ b/src/include/block_gns.h
@@ -39,12 +39,12 @@ struct GNSNameRecordBlock
   /**
    * The public key of the authority
    */
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded public_key;
+  struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
 
   /**
    * GNUNET_RSA_Signature using RSA-key generated from the records.
    */
-  struct GNUNET_CRYPTO_RsaSignature signature;
+  struct GNUNET_CRYPTO_EccSignature signature;
 
   /* number of records that follow */
   uint32_t rd_count GNUNET_PACKED;
diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h
index f7f784f6e..66d48e0e2 100644
--- a/src/include/gnunet_consensus_service.h
+++ b/src/include/gnunet_consensus_service.h
@@ -4,7 +4,7 @@
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
-      by the Free Software Foundation; either version 2, or (at your
+      by the Free Software Foundation; either version 3, or (at your
       option) any later version.
 
       GNUnet is distributed in the hope that it will be useful, but
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index a3c4e999f..eb16e0120 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -299,10 +299,13 @@ struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded
 };
 
 
+/**
+ * Private ECC key encoded for transmission (with length prefix).
+ */
 struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded
 {
   /**
-   * Overall size of the private key.
+   * Overall size of the private key in network byte order.
    */
   uint16_t size;
 
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index 8d2fde3d6..739bfa0f6 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -173,7 +173,7 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
                    const char * name,
                    enum GNUNET_GNS_RecordType type,
                    int only_cached,
-                   struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
+                   struct GNUNET_CRYPTO_EccPrivateKey *shorten_key,
                    GNUNET_GNS_LookupResultProcessor proc,
                    void *proc_cls);
 
@@ -199,7 +199,7 @@ GNUNET_GNS_lookup_zone (struct GNUNET_GNS_Handle *handle,
                         struct GNUNET_CRYPTO_ShortHashCode *zone,
                         enum GNUNET_GNS_RecordType type,
                         int only_cached,
-                        struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key,
+                        struct GNUNET_CRYPTO_EccPrivateKey *shorten_key,
                         GNUNET_GNS_LookupResultProcessor proc,
                         void *proc_cls);
 
diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h
index 1168e0d13..e969170e5 100644
--- a/src/include/gnunet_namestore_plugin.h
+++ b/src/include/gnunet_namestore_plugin.h
@@ -53,12 +53,12 @@ extern "C"
  *        because the user queried for a particular record type only)
  */
 typedef void (*GNUNET_NAMESTORE_RecordIterator) (void *cls,
-                                                 const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+                                                 const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
                                                  struct GNUNET_TIME_Absolute expire,
                                                  const char *name,
                                                  unsigned int rd_len,
                                                  const struct GNUNET_NAMESTORE_RecordData *rd,
-                                                 const struct GNUNET_CRYPTO_RsaSignature *signature);
+                                                 const struct GNUNET_CRYPTO_EccSignature *signature);
 
 
 /**
@@ -88,12 +88,12 @@ struct GNUNET_NAMESTORE_PluginFunctions
    * @return GNUNET_OK on success, else GNUNET_SYSERR
    */
   int (*put_records) (void *cls, 
-                      const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+                      const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
                       struct GNUNET_TIME_Absolute expire,
                       const char *name,
                       unsigned int rd_len,
                       const struct GNUNET_NAMESTORE_RecordData *rd,
-                      const struct GNUNET_CRYPTO_RsaSignature *signature);
+                      const struct GNUNET_CRYPTO_EccSignature *signature);
 
 
   /**
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index 4267e2044..38083ed9c 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -243,12 +243,12 @@ struct GNUNET_NAMESTORE_RecordData
  */
 struct GNUNET_NAMESTORE_QueueEntry *
 GNUNET_NAMESTORE_record_put (struct GNUNET_NAMESTORE_Handle *h,
-                             const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+                             const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
                              const char *name,
                              struct GNUNET_TIME_Absolute freshness,
                              unsigned int rd_count,
                              const struct GNUNET_NAMESTORE_RecordData *rd,
-                             const struct GNUNET_CRYPTO_RsaSignature *signature,
+                             const struct GNUNET_CRYPTO_EccSignature *signature,
                              GNUNET_NAMESTORE_ContinuationWithStatus cont,
                              void *cont_cls);
 
@@ -266,12 +266,12 @@ GNUNET_NAMESTORE_record_put (struct GNUNET_NAMESTORE_Handle *h,
  * @return GNUNET_OK if the signature is valid
  */
 int
-GNUNET_NAMESTORE_verify_signature (const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *public_key,
+GNUNET_NAMESTORE_verify_signature (const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *public_key,
                                    const struct GNUNET_TIME_Absolute freshness,
                                    const char *name,
                                    unsigned int rd_count,
                                    const struct GNUNET_NAMESTORE_RecordData *rd,
-                                   const struct GNUNET_CRYPTO_RsaSignature *signature);
+                                   const struct GNUNET_CRYPTO_EccSignature *signature);
 
 
 /**
@@ -290,7 +290,7 @@ GNUNET_NAMESTORE_verify_signature (const struct GNUNET_CRYPTO_RsaPublicKeyBinary
  */
 struct GNUNET_NAMESTORE_QueueEntry *
 GNUNET_NAMESTORE_record_create (struct GNUNET_NAMESTORE_Handle *h,
-                                const struct GNUNET_CRYPTO_RsaPrivateKey *pkey,
+                                const struct GNUNET_CRYPTO_EccPrivateKey *pkey,
                                 const char *name,
                                 const struct GNUNET_NAMESTORE_RecordData *rd,
                                 GNUNET_NAMESTORE_ContinuationWithStatus cont,
@@ -314,7 +314,7 @@ GNUNET_NAMESTORE_record_create (struct GNUNET_NAMESTORE_Handle *h,
  */
 struct GNUNET_NAMESTORE_QueueEntry *
 GNUNET_NAMESTORE_record_remove (struct GNUNET_NAMESTORE_Handle *h,
-                                const struct GNUNET_CRYPTO_RsaPrivateKey *pkey,
+                                const struct GNUNET_CRYPTO_EccPrivateKey *pkey,
                                 const char *name,
                                 const struct GNUNET_NAMESTORE_RecordData *rd,
                                 GNUNET_NAMESTORE_ContinuationWithStatus cont,
@@ -338,12 +338,12 @@ GNUNET_NAMESTORE_record_remove (struct GNUNET_NAMESTORE_Handle *h,
  *        because the user queried for a particular record type only)
  */
 typedef void (*GNUNET_NAMESTORE_RecordProcessor) (void *cls,
-                                                  const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+                                                  const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
                                                   struct GNUNET_TIME_Absolute freshness,                            
                                                   const char *name,
                                                   unsigned int rd_len,
                                                   const struct GNUNET_NAMESTORE_RecordData *rd,
-                                                  const struct GNUNET_CRYPTO_RsaSignature *signature);
+                                                  const struct GNUNET_CRYPTO_EccSignature *signature);
 
 
 /**