[GNUnet-SVN] r28739 - gnunet/src/namestore

[gnunet]

Author: wachs
Date: 2013-08-21 11:53:53 +0200 (Wed, 21 Aug 2013)
New Revision: 28739

Added:
   gnunet/src/namestore/test_namestore_api_blocks.c
Removed:
   gnunet/src/namestore/test_namestore_api_sign_verify.c
Modified:
   gnunet/src/namestore/Makefile.am
Log:
reorder tests: namestore_common -> plugins -> api
block test


Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am    2013-08-21 09:46:33 UTC (rev 28738)
+++ gnunet/src/namestore/Makefile.am    2013-08-21 09:53:53 UTC (rev 28739)
@@ -41,28 +41,27 @@
 
 if HAVE_TESTING
 TESTING_TESTS = \
- test_namestore_api \
- test_namestore_api_put \
- test_namestore_api_lookup \
- test_namestore_api_lookup_specific_type \
- test_namestore_api_create \
- test_namestore_api_create_update \
- test_namestore_api_remove \
- test_namestore_api_remove_not_existing_record \
- test_namestore_api_zone_to_name \
- test_namestore_api_monitoring \
- test_namestore_api_zone_iteration \
- test_namestore_api_zone_iteration_specific_zone \
- test_namestore_api_zone_iteration_stop
+ test_namestore_api
+ #test_namestore_api_lookup \
+ #test_namestore_api_lookup_specific_type \
+ #test_namestore_api_create \
+ #test_namestore_api_create_update \
+ #test_namestore_api_remove \
+ #test_namestore_api_remove_not_existing_record \
+ #test_namestore_api_zone_to_name \
+ #test_namestore_api_monitoring \
+ #test_namestore_api_zone_iteration \
+ #test_namestore_api_zone_iteration_specific_zone \
+ #test_namestore_api_zone_iteration_stop
 endif
 
 if HAVE_SQLITE
 check_PROGRAMS = \
+ test_namestore_record_serialization \
+ test_namestore_api_blocks \
  $(SQLITE_TESTS) \
  $(POSTGRES_TESTS) \
- $(TESTING_TESTS) \
- test_namestore_record_serialization \
- test_namestore_api_sign_verify
+ $(TESTING_TESTS)
 endif
 
 # end of 'HAVE_EXPERIMENTAL' for testcases 
@@ -173,9 +172,9 @@
   $(top_builddir)/src/util/libgnunetutil.la \
   libgnunetnamestore.la
 
-test_namestore_api_sign_verify_SOURCES = \
- test_namestore_api_sign_verify.c
-test_namestore_api_sign_verify_LDADD = \
+test_namestore_api_blocks_SOURCES = \
+ test_namestore_api_blocks.c
+test_namestore_api_blocks_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la

Copied: gnunet/src/namestore/test_namestore_api_blocks.c (from rev 28731, 
gnunet/src/namestore/test_namestore_api_sign_verify.c)
===================================================================
--- gnunet/src/namestore/test_namestore_api_blocks.c                            
(rev 0)
+++ gnunet/src/namestore/test_namestore_api_blocks.c    2013-08-21 09:53:53 UTC 
(rev 28739)
@@ -0,0 +1,149 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009 Christian Grothoff (and other contributing authors)
+
+     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 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     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.
+*/
+/**
+ * @file namestore/test_namestore_api_blocks.c
+ * @brief testcase for block creation, verification and decryption
+ */
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_namestore_service.h"
+#include "namestore.h"
+#include "gnunet_signatures.h"
+
+#define RECORDS 5
+
+#define TEST_RECORD_TYPE 1234
+
+#define TEST_RECORD_DATALEN 123
+
+#define TEST_RECORD_DATA 'a'
+
+#define TEST_REMOVE_RECORD_TYPE 4321
+
+#define TEST_REMOVE_RECORD_DATALEN 255
+
+#define TEST_REMOVE_RECORD_DATA 'b'
+
+
+static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
+
+static struct GNUNET_NAMESTORE_RecordData *s_rd;
+
+static char *s_name;
+
+static int res;
+
+
+static struct GNUNET_NAMESTORE_RecordData *
+create_record (int count)
+{
+  unsigned int c;
+  struct GNUNET_NAMESTORE_RecordData * rd;
+
+  rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+  for (c = 0; c < count; c++)
+  {
+    rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
+    rd[c].record_type = TEST_RECORD_TYPE;
+    rd[c].data_size = TEST_RECORD_DATALEN;
+    rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
+    memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
+  }
+  return rd;
+}
+
+
+static void
+rd_decrypt_cb (void *cls,
+                                                unsigned int rd_count,
+                                                const struct 
GNUNET_NAMESTORE_RecordData *rd)
+{
+  char rd_cmp_data[TEST_RECORD_DATALEN];
+
+  int c;
+
+  GNUNET_assert (RECORDS == rd_count);
+  GNUNET_assert (NULL != rd);
+
+  memset (rd_cmp_data, 'a', TEST_RECORD_DATALEN);
+
+  for (c = 0; c < rd_count; c++)
+  {
+       GNUNET_assert (TEST_RECORD_TYPE == rd[c].record_type);
+       GNUNET_assert (TEST_RECORD_DATALEN == rd[c].data_size);
+       GNUNET_assert (0 == memcmp (&rd_cmp_data, rd[c].data, 
TEST_RECORD_DATALEN));
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Block was decrypted successfully \n");
+  res = 0;
+
+}
+
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct GNUNET_NAMESTORE_Block *block;
+  struct GNUNET_CRYPTO_EccPublicKey pubkey;
+
+  /* load privat key */
+  char *hostkey_file;
+  GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
+      "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", 
hostkey_file);
+  privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file);
+  GNUNET_free (hostkey_file);
+  GNUNET_assert (privkey != NULL);
+  struct GNUNET_TIME_Absolute expire = GNUNET_TIME_absolute_get();
+  /* get public key */
+  GNUNET_CRYPTO_ecc_key_get_public(privkey, &pubkey);
+
+  /* create record */
+  s_name = "DUMMY.dummy.gnunet";
+  s_rd = create_record (RECORDS);
+
+  /* Create block */
+  GNUNET_assert (NULL != (block = GNUNET_NAMESTORE_block_create (privkey, 
expire,s_name, s_rd, RECORDS)));
+  GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_verify (block));
+  GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_block_decrypt (block, &pubkey, 
s_name, &rd_decrypt_cb, s_name));
+
+  GNUNET_free (block);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  static char *const argvx[] = { "test-namestore-api",
+    "-c",
+    "test_namestore_api.conf",
+    NULL
+  };
+  static struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  res = 1;
+  GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, 
"test-namestore-api",
+                      "nohelp", options, &run, &res);
+  return res;
+}
+
+/* end of test_namestore_api_blocks.c */

Deleted: gnunet/src/namestore/test_namestore_api_sign_verify.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_sign_verify.c       2013-08-21 
09:46:33 UTC (rev 28738)
+++ gnunet/src/namestore/test_namestore_api_sign_verify.c       2013-08-21 
09:53:53 UTC (rev 28739)
@@ -1,143 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
-
-     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 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     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.
-*/
-/**
- * @file namestore/test_namestore_api_sign_verify.c
- * @brief testcase for signing and verifying
- */
-#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_namestore_service.h"
-#include "namestore.h"
-#include "gnunet_signatures.h"
-
-#define RECORDS 5
-
-#define TEST_RECORD_TYPE 1234
-
-#define TEST_RECORD_DATALEN 123
-
-#define TEST_RECORD_DATA 'a'
-
-#define TEST_REMOVE_RECORD_TYPE 4321
-
-#define TEST_REMOVE_RECORD_DATALEN 255
-
-#define TEST_REMOVE_RECORD_DATA 'b'
-
-
-static struct GNUNET_CRYPTO_EccPrivateKey * privkey;
-
-static struct GNUNET_CRYPTO_EccPublicKey pubkey;
-
-static struct GNUNET_NAMESTORE_RecordData *s_rd;
-
-static char *s_name;
-
-static int res;
-
-
-static struct GNUNET_NAMESTORE_RecordData *
-create_record (int count)
-{
-  unsigned int c;
-  struct GNUNET_NAMESTORE_RecordData * rd;
-
-  rd = GNUNET_malloc (count * sizeof (struct GNUNET_NAMESTORE_RecordData));
-  for (c = 0; c < count; c++)
-  {
-    rd[c].expiration_time = GNUNET_TIME_absolute_get().abs_value_us;
-    rd[c].record_type = TEST_RECORD_TYPE;
-    rd[c].data_size = TEST_RECORD_DATALEN;
-    rd[c].data = GNUNET_malloc(TEST_RECORD_DATALEN);
-    memset ((char *) rd[c].data, TEST_RECORD_DATA, TEST_RECORD_DATALEN);
-  }
-  return rd;
-}
-
-
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_CRYPTO_EccSignature * signature;
-
-  /* load privat key */
-  char *hostkey_file;
-  GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
-      "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey");
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", 
hostkey_file);
-  privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file);
-  GNUNET_free (hostkey_file);
-  GNUNET_assert (privkey != NULL);
-  struct GNUNET_TIME_Absolute expire = GNUNET_TIME_absolute_get();
-  /* get public key */
-  GNUNET_CRYPTO_ecc_key_get_public(privkey, &pubkey);
-
-  int res_c;
-  int res_w;
-
-  /* create record */
-  s_name = "DUMMY.dummy.gnunet";
-  s_rd = create_record (RECORDS);
-
-  signature = GNUNET_NAMESTORE_create_signature (privkey, expire, s_name, 
s_rd, RECORDS);
-  GNUNET_assert (signature != NULL);
-
-  res_c = GNUNET_NAMESTORE_verify_signature(&pubkey, expire, s_name, RECORDS, 
s_rd, signature);
-  GNUNET_break (res == GNUNET_OK);
-
-  GNUNET_free (signature);
-
-  signature = GNUNET_NAMESTORE_create_signature (privkey, expire, s_name, 
s_rd, RECORDS);
-  GNUNET_break (signature != NULL);
-
-  GNUNET_log_skip(1, GNUNET_NO);
-  res_w = GNUNET_NAMESTORE_verify_signature(&pubkey, expire, s_name, RECORDS - 
1, s_rd, signature);
-  GNUNET_break (res_w == GNUNET_SYSERR);
-
-  GNUNET_free (signature);
-
-  if ((res_c == GNUNET_OK) && (res_w == GNUNET_SYSERR))
-    res = 0;
-  else
-    res = 1;
-
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  static char *const argvx[] = { "test-namestore-api",
-    "-c",
-    "test_namestore_api.conf",
-    NULL
-  };
-  static struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  res = 1;
-  GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, 
"test-namestore-api",
-                      "nohelp", options, &run, &res);
-  return res;
-}
-
-/* end of test_namestore_api_sign_verify.c */