Link libgnunetblockgroup to libgnunetblock

[oweals/gnunet.git] / src / util / test_crypto_ecdh_eddsa.c

diff --git a/src/util/test_crypto_ecdh_eddsa.c b/src/util/test_crypto_ecdh_eddsa.c
index d8fee849e1448715bd8791b37f8ceccdf36f9ab8..ec7819c3bdfcdc4424f3d0d4e11fb3cff74422fb 100644 (file)
--- a/src/util/test_crypto_ecdh_eddsa.c
+++ b/src/util/test_crypto_ecdh_eddsa.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2002-2015 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2002-2015 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,75 +14,73 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 
 */
 /**
- * @file util/test_crypto_ecdh_ecdsa.c
+ * @file util/test_crypto_ecdh_eddsa.c
  * @brief testcase for ECC DH key exchange with EdDSA private keys.
- * @author Christian Grothoff, Bart Polot
+ * @author Christian Grothoff
+ * @author Bart Polot
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include <gcrypt.h>
 
 
-int
-main (int argc, char *argv[])
+static int
+test_ecdh()
 {
-  struct GNUNET_CRYPTO_EddsaPrivateKey *priv_dsa1;
-  struct GNUNET_CRYPTO_EddsaPrivateKey *priv_dsa2;
+  struct GNUNET_CRYPTO_EddsaPrivateKey *priv_dsa;
+  struct GNUNET_CRYPTO_EcdhePrivateKey *priv_ecdh;
   struct GNUNET_CRYPTO_EddsaPublicKey id1;
-  struct GNUNET_CRYPTO_EddsaPublicKey id2;
-
-  struct GNUNET_CRYPTO_EcdhePrivateKey *priv1;
-  struct GNUNET_CRYPTO_EcdhePrivateKey *priv2;
-  struct GNUNET_CRYPTO_EcdhePublicKey pub2;
+  struct GNUNET_CRYPTO_EcdhePublicKey id2;
   struct GNUNET_HashCode dh[3];
 
+  /* Generate keys */
+  priv_dsa = GNUNET_CRYPTO_eddsa_key_create ();
+  priv_ecdh = GNUNET_CRYPTO_ecdhe_key_create ();
+  /* Extract public keys */
+  GNUNET_CRYPTO_eddsa_key_get_public (priv_dsa,
+                                      &id1);
+  GNUNET_CRYPTO_ecdhe_key_get_public (priv_ecdh,
+                                      &id2);
+  /* Do ECDH */
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CRYPTO_eddsa_ecdh (priv_dsa,
+                                           &id2,
+                                           &dh[0]));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CRYPTO_ecdh_eddsa (priv_ecdh,
+                                           &id1,
+                                           &dh[1]));
+  /* Check that both DH results are equal. */
+  GNUNET_assert (0 == memcmp (&dh[0], &dh[1],
+                             sizeof (struct GNUNET_HashCode)));
+  GNUNET_free (priv_dsa);
+  GNUNET_free (priv_ecdh);
+  return 0;
+}
+
+
+int
+main (int argc, char *argv[])
+{
   if (! gcry_check_version ("1.6.0"))
   {
     FPRINTF (stderr,
-             _
-             ("libgcrypt has not the expected version (version %s is required).\n"),
+             _("libgcrypt has not the expected version (version %s is required).\n"),
              "1.6.0");
     return 0;
   }
   if (getenv ("GNUNET_GCRYPT_DEBUG"))
     gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1u , 0);
   GNUNET_log_setup ("test-crypto-ecdh-eddsa", "WARNING", NULL);
-
-  /* Generate, cast keys */
-  priv_dsa1 = GNUNET_CRYPTO_eddsa_key_create ();
-  priv_dsa2 = GNUNET_CRYPTO_eddsa_key_create ();
-  priv1 = (struct GNUNET_CRYPTO_EcdhePrivateKey *) priv_dsa1;
-  priv2 = (struct GNUNET_CRYPTO_EcdhePrivateKey *) priv_dsa2;
-
-  /* Extract public keys */
-  GNUNET_CRYPTO_eddsa_key_get_public (priv_dsa1, &id1);
-  GNUNET_CRYPTO_eddsa_key_get_public (priv_dsa2, &id2);
-  GNUNET_CRYPTO_ecdhe_key_get_public (priv2, &pub2);
-
-  /* Do ECDH */
-  GNUNET_CRYPTO_ecc_ecdh (priv1, (struct GNUNET_CRYPTO_EcdhePublicKey *)&id2, &dh[0]);
-  GNUNET_CRYPTO_ecc_ecdh (priv2, (struct GNUNET_CRYPTO_EcdhePublicKey *)&id1, &dh[1]);
-  GNUNET_CRYPTO_ecc_ecdh (priv1, &pub2, &dh[2]);
-
-  /* Check that both DH results are equal. */
-  GNUNET_assert (0 == memcmp (&dh[0], &dh[1],
-                             sizeof (struct GNUNET_HashCode)));
-
-  /* FIXME: Maybe it should be the same as with ECDHE. */
-  // GNUNET_assert (0 == memcmp (&dh[1], &dh[2],
-  //                            sizeof (struct GNUNET_HashCode)));
-  // GNUNET_assert (0 == memcmp (&id1, &pub1,
-  //                            sizeof (struct GNUNET_CRYPTO_EcdhePublicKey)));
-
-  /* Free */
-  GNUNET_free (priv1);
-  GNUNET_free (priv2);
+  if (0 != test_ecdh())
+    return 1;
   return 0;
 }
 
-/* end of test_crypto_ecdh_ecdsa.c */
+
+/* end of test_crypto_ecdh_eddsa.c */