[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20394 - gnunet/src/namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20394 - gnunet/src/namestore |
Date: |
Fri, 9 Mar 2012 10:41:46 +0100 |
Author: wachs
Date: 2012-03-09 10:41:46 +0100 (Fri, 09 Mar 2012)
New Revision: 20394
Modified:
gnunet/src/namestore/Makefile.am
gnunet/src/namestore/gnunet-service-namestore.c
gnunet/src/namestore/test_namestore_api_lookup.c
gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
Log:
- changes
Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am 2012-03-09 09:40:03 UTC (rev 20393)
+++ gnunet/src/namestore/Makefile.am 2012-03-09 09:41:46 UTC (rev 20394)
@@ -193,6 +193,7 @@
EXTRA_DIST = \
test_namestore_api.conf \
test_plugin_namestore_sqlite.conf\
+ test_hostkey \
zonefiles/4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zone
\
zonefiles/KJI3AL00K91EDPFJF58DAJM7H61D189TLP70N56JL8SVDCJE1SJ3SNNBOQPPONTL37FMHPS39SMK2NMVC0GQMGA6QCMHITT78O8GF80.zone
Modified: gnunet/src/namestore/gnunet-service-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-service-namestore.c 2012-03-09 09:40:03 UTC
(rev 20393)
+++ gnunet/src/namestore/gnunet-service-namestore.c 2012-03-09 09:41:46 UTC
(rev 20394)
@@ -487,7 +487,6 @@
memcpy (rd_tmp, rd_ser, rd_ser_len);
GNUNET_SERVER_notification_context_unicast (snc, lnc->nc->client, (const
struct GNUNET_MessageHeader *) lnr_msg, GNUNET_NO);
- GNUNET_free_non_null(signature_new);
GNUNET_free (lnr_msg);
}
Modified: gnunet/src/namestore/test_namestore_api_lookup.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_lookup.c 2012-03-09 09:40:03 UTC
(rev 20393)
+++ gnunet/src/namestore/test_namestore_api_lookup.c 2012-03-09 09:41:46 UTC
(rev 20394)
@@ -256,11 +256,7 @@
size_t rd_ser_len;
/* load privat key */
- char *hostkey_file;
- GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR,
"4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zone");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n",
hostkey_file);
- privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file);
- GNUNET_free (hostkey_file);
+ privkey = GNUNET_CRYPTO_rsa_key_create_from_file("test_hostkey");
GNUNET_assert (privkey != NULL);
/* get public key */
GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey);
Modified: gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
===================================================================
--- gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2012-03-09 09:40:03 UTC (rev 20393)
+++ gnunet/src/namestore/test_namestore_api_zone_iteration_stop.c
2012-03-09 09:41:46 UTC (rev 20394)
@@ -226,7 +226,7 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Comparing results name %s \n", name);
if (0 == strcmp (name, s_name_1))
- {
+ { /* name_1 */
if (rd_count == 1)
{
if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_1))
@@ -247,7 +247,7 @@
}
}
else if (0 == strcmp (name, s_name_2))
- {
+ { /* name_2 */
if (rd_count == 1)
{
if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_2))
@@ -261,6 +261,7 @@
failed = GNUNET_YES;
GNUNET_break (0);
}
+ GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_verify_signature(&pubkey2,
s_name_2, rd_count, rd, sig_2));
if (0 != memcmp (signature, sig_2, sizeof (struct
GNUNET_CRYPTO_RsaSignature)))
{
failed = GNUNET_YES;
@@ -268,7 +269,7 @@
}
}
else if (0 == strcmp (name, s_name_3))
- {
+ { /* name_3 */
if (rd_count == 1)
{
if (GNUNET_YES != GNUNET_NAMESTORE_records_cmp(rd, s_rd_3))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20394 - gnunet/src/namestore,
gnunet <=