[GNUnet-SVN] r35608 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2015-04-27 21:14:55 +0200 (Mon, 27 Apr 2015)
New Revision: 35608

Modified:
   gnunet/src/cadet/cadet_protocol.h
Log:
- due to incompatibilities in the representation of the ECC public key for ECDH 
and EdDSA, peers must provide en explicit ECDH key and sign it with theis EdDSA 
ID.

Modified: gnunet/src/cadet/cadet_protocol.h
===================================================================
--- gnunet/src/cadet/cadet_protocol.h   2015-04-27 19:14:54 UTC (rev 35607)
+++ gnunet/src/cadet/cadet_protocol.h   2015-04-27 19:14:55 UTC (rev 35608)
@@ -122,14 +122,31 @@
   struct GNUNET_MessageHeader header;
 
   /**
-   * Sender's ephemeral public ECC key (always for NIST P-521) encoded in a
+   * An EdDSA signature of the permanent ECDH key with the Peer's ID key.
+   */
+  struct GNUNET_CRYPTO_EddsaSignature signature;
+
+  /**
+   * Information about what is being signed (@a permanent_key).
+   */
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+
+  /**
+   * Sender's permanent_key public ECC key encoded in a
    * format suitable for network transmission, as created
    * using 'gcry_sexp_sprint'.
    */
+  struct GNUNET_CRYPTO_EcdhePublicKey permanent_key;
+
+  /**
+   * Sender's ephemeral public ECC key encoded in a
+   * format suitable for network transmission, as created
+   * using 'gcry_sexp_sprint'.
+   */
   struct GNUNET_CRYPTO_EcdhePublicKey ephemeral_key;
 
   /**
-   * Sender's next ephemeral public ECC key (always for NIST P-521) encoded in 
a
+   * Sender's next ephemeral public ECC key encoded in a
    * format suitable for network transmission, as created
    * using 'gcry_sexp_sprint'.
    */