-ecc signing working

3 files changed, 6 insertions, 6 deletions

diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index ff7bffdbb..1e2af8925 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -91,16 +91,15 @@ enum GNUNET_CRYPTO_Quality
 /**
  * Length of a hash value
  */
-#define GNUNET_CRYPTO_HASH_LENGTH 512/8
+#define GNUNET_CRYPTO_HASH_LENGTH (512/8)
 
 /**
- * FIXME: what is an acceptable value here?
- * Note: round to multiple of 8 minus 2.
+ * Maximum length of an ECC signature.
+ * Note: round up to multiple of 8 minus 2 for alignment.
  */
-#define GNUNET_CRYPTO_ECC_SIGNATURE_DATA_ENCODING_LENGTH 138
+#define GNUNET_CRYPTO_ECC_SIGNATURE_DATA_ENCODING_LENGTH 190
 
 /**
- * FIXME: what is an acceptable value here?
  * Maximum length of the public key (q-point, Q = dP) when encoded.
  */
 #define GNUNET_CRYPTO_ECC_MAX_PUBLIC_KEY_LENGTH 140
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 239f3c91e..7983d61db 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -211,6 +211,7 @@ check_PROGRAMS = \
  test_crypto_aes \
  test_crypto_aes_weak \
  test_crypto_crc \
+ test_crypto_ecc \
  test_crypto_hash \
  test_crypto_hkdf \
  test_crypto_ksk \
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index cfc5deb25..81429e3c4 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -942,7 +942,7 @@ data_to_pkcs1 (const struct GNUNET_CRYPTO_EccSignaturePurpose *purpose)
   gcry_sexp_t data;
 
   GNUNET_CRYPTO_short_hash (purpose, ntohl (purpose->size), &hc);
-#define FORMATSTRING "(4:data(32:01234567890123456789012345678901))"
+#define FORMATSTRING "(4:data(5:flags3:raw)(5:value32:01234567890123456789012345678901))"
 #define FORMATSTRING2 "(4:data(4:hash6:sha25632:01234567890123456789012345678901))"
   bufSize = strlen (FORMATSTRING) + 1;
   {