X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnamestore%2Ftest_namestore_api_zone_to_name.c;h=31ec84a81f3f0ae292105aa5affb2b596f16effb;hb=392baa82fc240d76b31a353c2d729a6f83f10b2c;hp=e5db28165eb37e9ee12c0eaf79890e08443a5493;hpb=15f55fea6e6d2d1656e345eab131887efbd937b4;p=oweals%2Fgnunet.git diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index e5db28165..31ec84a81 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009 Christian Grothoff (and other contributing authors) + Copyright (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 @@ -14,19 +14,17 @@ 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 namestore/test_namestore_api_zone_to_name.c * @brief testcase for zone to name translation */ #include "platform.h" -#include "gnunet_common.h" #include "gnunet_namestore_service.h" -#include "gnunet_testing_lib-new.h" +#include "gnunet_testing_lib.h" #include "namestore.h" -#include "gnunet_signatures.h" #define RECORDS 5 @@ -36,16 +34,16 @@ #define TEST_RECORD_DATA 'a' -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10) +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) static struct GNUNET_NAMESTORE_Handle * nsh; -static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; +static struct GNUNET_SCHEDULER_Task * endbadly_task; -static struct GNUNET_CRYPTO_RsaPrivateKey * privkey; +static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; -static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey; +static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey; static struct GNUNET_TIME_Absolute expire; @@ -55,10 +53,11 @@ static struct GNUNET_CRYPTO_ShortHashCode s_zone_value; static char * s_name; -static struct GNUNET_CRYPTO_RsaSignature *s_signature; +static struct GNUNET_CRYPTO_EcdsaSignature *s_signature; static int res; +static char *directory; /** * Re-establish the connection to the service. @@ -70,10 +69,10 @@ static void endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { if (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES); + GNUNET_NAMESTORE_disconnect (nsh); nsh = NULL; if (privkey != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey); + GNUNET_free (privkey); privkey = NULL; res = 1; } @@ -82,28 +81,28 @@ endbadly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - if (endbadly_task != GNUNET_SCHEDULER_NO_TASK) + if (endbadly_task != NULL) { GNUNET_SCHEDULER_cancel (endbadly_task); - endbadly_task = GNUNET_SCHEDULER_NO_TASK; + endbadly_task = NULL; } if (privkey != NULL) - GNUNET_CRYPTO_rsa_key_free (privkey); + GNUNET_free (privkey); privkey = NULL; if (nsh != NULL) - GNUNET_NAMESTORE_disconnect (nsh, GNUNET_YES); + GNUNET_NAMESTORE_disconnect (nsh); nsh = NULL; } static void zone_to_name_proc (void *cls, - const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key, + const struct GNUNET_CRYPTO_EcdsaPublicKey *zone_key, struct GNUNET_TIME_Absolute expire, const char *n, unsigned int rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd, - const struct GNUNET_CRYPTO_RsaSignature *signature) + const struct GNUNET_GNSRECORD_Data *rd, + const struct GNUNET_CRYPTO_EcdsaSignature *signature) { int fail = GNUNET_NO; @@ -125,7 +124,7 @@ zone_to_name_proc (void *cls, fail = GNUNET_YES; GNUNET_break (0); } - if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded)))) + if ((zone_key == NULL) || (0 != memcmp (zone_key, &pubkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)))) { fail = GNUNET_YES; GNUNET_break (0); @@ -155,7 +154,8 @@ put_cont (void *cls, int32_t success, const char *emsg) else { res = 1; - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to put records for name `%s'\n", name); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to put records for name `%s'\n", name); GNUNET_SCHEDULER_add_now(&end, NULL); } } @@ -163,37 +163,50 @@ put_cont (void *cls, int32_t success, const char *emsg) static void run (void *cls, - const struct GNUNET_CONFIGURATION_Handle *cfg) + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) { + struct GNUNET_TIME_Absolute et; + + directory = NULL; + GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_TEST_HOME", &directory); + GNUNET_DISK_directory_remove (directory); + endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL); - GNUNET_asprintf(&s_name, "dummy"); + GNUNET_asprintf (&s_name, "dummy"); /* 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_rsa_key_create_from_file(hostkey_file); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Using zonekey file `%s'\n", + hostkey_file); + privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); GNUNET_free (hostkey_file); GNUNET_assert (privkey != NULL); /* get public key */ - GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey); + GNUNET_CRYPTO_ecdsa_key_get_public(privkey, &pubkey); /* zone hash */ - GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &s_zone); + GNUNET_CRYPTO_short_hash (&pubkey, sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey), &s_zone); GNUNET_CRYPTO_short_hash (s_name, strlen (s_name) + 1, &s_zone_value); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using PKEY `%s' \n", GNUNET_short_h2s (&s_zone_value)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Using PKEY `%s' \n", + GNUNET_NAMESTORE_short_h2s (&s_zone_value)); - struct GNUNET_NAMESTORE_RecordData rd; - rd.expiration = GNUNET_TIME_absolute_get(); - rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; + struct GNUNET_GNSRECORD_Data rd; + rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; + rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; rd.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode); rd.data = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_ShortHashCode)); + rd.flags = 0; memcpy ((char *) rd.data, &s_zone_value, sizeof (struct GNUNET_CRYPTO_ShortHashCode)); nsh = GNUNET_NAMESTORE_connect (cfg); GNUNET_break (NULL != nsh); expire = GNUNET_TIME_absolute_get (); - s_signature = GNUNET_NAMESTORE_create_signature(privkey, rd.expiration, s_name, &rd, 1); + et.abs_value_us = rd.expiration_time; + s_signature = GNUNET_NAMESTORE_create_signature(privkey, et, s_name, &rd, 1); GNUNET_NAMESTORE_record_put(nsh, &pubkey, s_name, expire, 1, &rd, s_signature, put_cont, NULL); GNUNET_free ((void *) rd.data); @@ -205,13 +218,19 @@ int main (int argc, char *argv[]) { res = 1; - if (0 != - GNUNET_TESTING_service_run ("test-namestore-api-zone-to-name", - "namestore", - "test_namestore_api.conf", - &run, - NULL)) - return 1; + if (0 != + GNUNET_TESTING_peer_run ("test-namestore-api-zone-to-name", + "test_namestore_api.conf", + &run, + NULL)) + { + res = 1; + } + if (NULL != directory) + { + GNUNET_DISK_directory_remove (directory); + GNUNET_free (directory); + } return res; }