-add more tests for eddsa and gnsrecord

3 files changed, 24 insertions, 23 deletions

diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c
index 289f0e885..7fe0c6953 100644
--- a/src/gnsrecord/gnsrecord_crypto.c
+++ b/src/gnsrecord/gnsrecord_crypto.c
@@ -396,11 +396,8 @@ block_create_eddsa (const struct GNUNET_CRYPTO_EddsaPrivateKey *key,
                                             label,
                                             "gns",
                                             &dkey);
-    // FIXME: We may want a key_get_public_from_private_scalar function
-    struct GNUNET_CRYPTO_EddsaPublicKey test;
-    crypto_scalarmult_ed25519_base_noclamp (test.q_y,
-                                            dkey.s);
-    edblock->derived_key = test;
+    GNUNET_CRYPTO_eddsa_key_get_public_from_scalar (&dkey,
+                                                    &edblock->derived_key);
     derive_block_xsalsa_key (nonce,
                              skey,
                              label,
@@ -438,25 +435,21 @@ GNUNET_GNSRECORD_block_create (const struct GNUNET_IDENTITY_PrivateKey *key,
                                const struct GNUNET_GNSRECORD_Data *rd,
                                unsigned int rd_count)
 {
-  struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
-  struct GNUNET_CRYPTO_EddsaPublicKey edkey;
-
+  struct GNUNET_IDENTITY_PublicKey pkey;
+  GNUNET_IDENTITY_key_get_public (key,
+                                  &pkey);
   switch (ntohl (key->type))
   {
   case GNUNET_GNSRECORD_TYPE_PKEY:
-    GNUNET_CRYPTO_ecdsa_key_get_public (&key->ecdsa_key,
-                                        &pkey);
     return block_create_ecdsa (&key->ecdsa_key,
-                               &pkey,
+                               &pkey.ecdsa_key,
                                expire,
                                label,
                                rd,
                                rd_count);
   case GNUNET_GNSRECORD_TYPE_EDKEY:
-    GNUNET_CRYPTO_eddsa_key_get_public (&key->eddsa_key,
-                                        &edkey);
     return block_create_eddsa (&key->eddsa_key,
-                               &edkey,
+                               &pkey.eddsa_key,
                                expire,
                                label,
                                rd,
@@ -930,7 +923,7 @@ GNUNET_GNSRECORD_query_from_public_key (const struct
     GNUNET_CRYPTO_eddsa_public_key_derive (&pub->eddsa_key,
                                            label,
                                            "gns",
-                                           &pd.eddsa_key);
+                                           &(pd.eddsa_key));
     GNUNET_CRYPTO_hash (&pd.eddsa_key,
                         sizeof (pd.eddsa_key),
                         query);
diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c
index 2fe315bd8..8d3a6421f 100644
--- a/src/gnsrecord/gnsrecord_misc.c
+++ b/src/gnsrecord/gnsrecord_misc.c
@@ -377,7 +377,7 @@ GNUNET_GNSRECORD_query_from_block (const struct GNUNET_GNSRECORD_Block *block,
   switch (ntohl (block->type))
   {
   case GNUNET_GNSRECORD_TYPE_PKEY:
-    GNUNET_CRYPTO_hash (&block->ecdsa_block.derived_key,
+    GNUNET_CRYPTO_hash (&(block->ecdsa_block.derived_key),
                         sizeof (block->ecdsa_block.derived_key),
                         query);
     return GNUNET_OK;
diff --git a/src/gnsrecord/test_gnsrecord_crypto.c b/src/gnsrecord/test_gnsrecord_crypto.c
index b9b2b5ba5..9e5a1aa7e 100644
--- a/src/gnsrecord/test_gnsrecord_crypto.c
+++ b/src/gnsrecord/test_gnsrecord_crypto.c
@@ -92,6 +92,7 @@ rd_decrypt_cb (void *cls,
   res = 0;
 }
 
+
 static void
 test_with_type (struct GNUNET_IDENTITY_PrivateKey *privkey)
 {
@@ -99,6 +100,7 @@ test_with_type (struct GNUNET_IDENTITY_PrivateKey *privkey)
   struct GNUNET_IDENTITY_PublicKey pubkey;
   struct GNUNET_HashCode query_pub;
   struct GNUNET_HashCode query_priv;
+  struct GNUNET_HashCode query_block;
   struct GNUNET_TIME_Absolute expire = GNUNET_TIME_absolute_get ();
 
 
@@ -117,7 +119,7 @@ test_with_type (struct GNUNET_IDENTITY_PrivateKey *privkey)
                               &query_pub,
                               sizeof(struct GNUNET_HashCode)));
   /* create record */
-  s_name = "DUMMY.dummy.gnunet";
+  s_name = "testlabel";
   s_rd = create_record (RECORDS);
 
   /* Create block */
@@ -128,6 +130,13 @@ test_with_type (struct GNUNET_IDENTITY_PrivateKey *privkey)
                                                            s_rd,
                                                            RECORDS)));
   GNUNET_assert (GNUNET_OK ==
+                 GNUNET_GNSRECORD_query_from_block (block,
+                                                    &query_block));
+  GNUNET_assert (0 == memcmp (&query_pub,
+                              &query_block,
+                              sizeof(struct GNUNET_HashCode)));
+
+  GNUNET_assert (GNUNET_OK ==
                  GNUNET_GNSRECORD_block_verify (block));
   GNUNET_assert (GNUNET_OK ==
                  GNUNET_GNSRECORD_block_decrypt (block,
@@ -139,7 +148,6 @@ test_with_type (struct GNUNET_IDENTITY_PrivateKey *privkey)
 }
 
 
-
 static void
 run (void *cls,
      char *const *args,
@@ -158,17 +166,17 @@ run (void *cls,
   test_with_type (&privkey);
   end = GNUNET_TIME_absolute_get ();
   printf ("Time: %llu ms\n", (unsigned long long)
-  GNUNET_TIME_absolute_get_difference (start,
-                                       end).rel_value_us);
+          GNUNET_TIME_absolute_get_difference (start,
+                                               end).rel_value_us);
 
   privkey_ed.type = htonl (GNUNET_GNSRECORD_TYPE_EDKEY);
   GNUNET_CRYPTO_eddsa_key_create (&privkey_ed.eddsa_key);
   start = GNUNET_TIME_absolute_get ();
-  test_with_type(&privkey_ed);
+  test_with_type (&privkey_ed);
   end = GNUNET_TIME_absolute_get ();
   printf ("Time: %llu ms\n", (unsigned long long)
-  GNUNET_TIME_absolute_get_difference (start,
-                                       end).rel_value_us);
+          GNUNET_TIME_absolute_get_difference (start,
+                                               end).rel_value_us);
 
 
 }