diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-03-19 18:37:04 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-03-19 18:37:04 +0000 |
commit | cdd5f401a24438425da10a11992c2bfd9992df47 (patch) | |
tree | adc9551920e029b854cd4cebe1bf6929245fd4a8 /src | |
parent | fc3a84931904e40da4783869117316a0401b456c (diff) | |
download | gnunet-cdd5f401a24438425da10a11992c2bfd9992df47.tar.gz gnunet-cdd5f401a24438425da10a11992c2bfd9992df47.zip |
- test use new zonekey files
Diffstat (limited to 'src')
18 files changed, 38 insertions, 22 deletions
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 3fac6dce9..365f2bfda 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -92,7 +92,7 @@ plugin_LTLIBRARIES = \ | |||
92 | $(SQLITE_PLUGIN) | 92 | $(SQLITE_PLUGIN) |
93 | 93 | ||
94 | libgnunet_plugin_namestore_sqlite_la_SOURCES = \ | 94 | libgnunet_plugin_namestore_sqlite_la_SOURCES = \ |
95 | plugin_namestore_sqlite.c | 95 | plugin_namestore_sqlite.c namestore_common.c |
96 | libgnunet_plugin_namestore_sqlite_la_LIBADD = \ | 96 | libgnunet_plugin_namestore_sqlite_la_LIBADD = \ |
97 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ | 97 | $(top_builddir)/src/namestore/libgnunetnamestore.la \ |
98 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 98 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
@@ -194,8 +194,8 @@ EXTRA_DIST = \ | |||
194 | test_namestore_api.conf \ | 194 | test_namestore_api.conf \ |
195 | test_plugin_namestore_sqlite.conf\ | 195 | test_plugin_namestore_sqlite.conf\ |
196 | test_hostkey \ | 196 | test_hostkey \ |
197 | zonefiles/4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zone \ | 197 | HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \ |
198 | zonefiles/KJI3AL00K91EDPFJF58DAJM7H61D189TLP70N56JL8SVDCJE1SJ3SNNBOQPPONTL37FMHPS39SMK2NMVC0GQMGA6QCMHITT78O8GF80.zone | 198 | N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey |
199 | 199 | ||
200 | 200 | ||
201 | test_plugin_namestore_sqlite_SOURCES = \ | 201 | test_plugin_namestore_sqlite_SOURCES = \ |
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index f45492fc8..012555539 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c | |||
@@ -194,7 +194,6 @@ int zone_to_disk_it (void *cls, | |||
194 | void *value) | 194 | void *value) |
195 | { | 195 | { |
196 | struct GNUNET_NAMESTORE_CryptoContainer * c = value; | 196 | struct GNUNET_NAMESTORE_CryptoContainer * c = value; |
197 | |||
198 | if (c->filename != NULL) | 197 | if (c->filename != NULL) |
199 | write_key_to_file(c->filename, c); | 198 | write_key_to_file(c->filename, c); |
200 | else | 199 | else |
@@ -205,9 +204,9 @@ int zone_to_disk_it (void *cls, | |||
205 | 204 | ||
206 | 205 | ||
207 | GNUNET_CONTAINER_multihashmap_remove (zonekeys, key, value); | 206 | GNUNET_CONTAINER_multihashmap_remove (zonekeys, key, value); |
208 | GNUNET_CRYPTO_rsa_key_free(c->privkey); | 207 | GNUNET_CRYPTO_rsa_key_free (c->privkey); |
209 | GNUNET_free (c->pubkey); | 208 | GNUNET_free (c->pubkey); |
210 | GNUNET_free(c->filename); | 209 | GNUNET_free (c->filename); |
211 | GNUNET_free (c); | 210 | GNUNET_free (c); |
212 | 211 | ||
213 | return GNUNET_OK; | 212 | return GNUNET_OK; |
@@ -246,7 +245,6 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
246 | 245 | ||
247 | GNUNET_SERVER_notification_context_destroy (snc); | 246 | GNUNET_SERVER_notification_context_destroy (snc); |
248 | snc = NULL; | 247 | snc = NULL; |
249 | |||
250 | GNUNET_CONTAINER_multihashmap_iterate(zonekeys, &zone_to_disk_it, NULL); | 248 | GNUNET_CONTAINER_multihashmap_iterate(zonekeys, &zone_to_disk_it, NULL); |
251 | GNUNET_CONTAINER_multihashmap_destroy(zonekeys); | 249 | GNUNET_CONTAINER_multihashmap_destroy(zonekeys); |
252 | 250 | ||
diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h index c7af82dc3..a4fb56136 100644 --- a/src/namestore/namestore.h +++ b/src/namestore/namestore.h | |||
@@ -46,6 +46,7 @@ | |||
46 | #define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT 447 | 46 | #define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_NEXT 447 |
47 | #define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP 448 | 47 | #define GNUNET_MESSAGE_TYPE_NAMESTORE_ZONE_ITERATION_STOP 448 |
48 | 48 | ||
49 | |||
49 | /** | 50 | /** |
50 | * Convert a short hash to a string (for printing debug messages). | 51 | * Convert a short hash to a string (for printing debug messages). |
51 | * This is one of the very few calls in the entire API that is | 52 | * This is one of the very few calls in the entire API that is |
@@ -57,6 +58,7 @@ | |||
57 | const char * | 58 | const char * |
58 | GNUNET_short_h2s (const struct GNUNET_CRYPTO_ShortHashCode * hc); | 59 | GNUNET_short_h2s (const struct GNUNET_CRYPTO_ShortHashCode * hc); |
59 | 60 | ||
61 | |||
60 | /** | 62 | /** |
61 | * Sign name and records | 63 | * Sign name and records |
62 | * | 64 | * |
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index 45fad545c..f6858876e 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "platform.h" | 27 | #include "platform.h" |
28 | #include "gnunet_namestore_plugin.h" | 28 | #include "gnunet_namestore_plugin.h" |
29 | #include "gnunet_namestore_service.h" | 29 | #include "gnunet_namestore_service.h" |
30 | #include "namestore.h" | ||
30 | #include <sqlite3.h> | 31 | #include <sqlite3.h> |
31 | 32 | ||
32 | /** | 33 | /** |
diff --git a/src/namestore/test_namestore_api.c b/src/namestore/test_namestore_api.c index 4c654ecf4..7e8de7374 100644 --- a/src/namestore/test_namestore_api.c +++ b/src/namestore/test_namestore_api.c | |||
@@ -168,7 +168,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
168 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL); | 168 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,endbadly, NULL); |
169 | 169 | ||
170 | char *hostkey_file; | 170 | char *hostkey_file; |
171 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 171 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
172 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
172 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 173 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
173 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 174 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
174 | GNUNET_free (hostkey_file); | 175 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_create.c b/src/namestore/test_namestore_api_create.c index 4490b85c6..7d60d8951 100644 --- a/src/namestore/test_namestore_api_create.c +++ b/src/namestore/test_namestore_api_create.c | |||
@@ -408,7 +408,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
408 | 408 | ||
409 | /* load privat key */ | 409 | /* load privat key */ |
410 | char *hostkey_file; | 410 | char *hostkey_file; |
411 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 411 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
412 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
412 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 413 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
413 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 414 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
414 | GNUNET_free (hostkey_file); | 415 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_create_update.c b/src/namestore/test_namestore_api_create_update.c index 6deb03bf0..a4f454974 100644 --- a/src/namestore/test_namestore_api_create_update.c +++ b/src/namestore/test_namestore_api_create_update.c | |||
@@ -445,7 +445,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
445 | 445 | ||
446 | /* load privat key */ | 446 | /* load privat key */ |
447 | char *hostkey_file; | 447 | char *hostkey_file; |
448 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 448 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
449 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
449 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 450 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
450 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 451 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
451 | GNUNET_free (hostkey_file); | 452 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_lookup_specific_type.c b/src/namestore/test_namestore_api_lookup_specific_type.c index ec5ca8b78..3cc2ad7ba 100644 --- a/src/namestore/test_namestore_api_lookup_specific_type.c +++ b/src/namestore/test_namestore_api_lookup_specific_type.c | |||
@@ -325,7 +325,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
325 | 325 | ||
326 | /* load privat key */ | 326 | /* load privat key */ |
327 | char *hostkey_file; | 327 | char *hostkey_file; |
328 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 328 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
329 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
329 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 330 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
330 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 331 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
331 | GNUNET_free (hostkey_file); | 332 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_put.c b/src/namestore/test_namestore_api_put.c index 6998d4996..8941b6b6d 100644 --- a/src/namestore/test_namestore_api_put.c +++ b/src/namestore/test_namestore_api_put.c | |||
@@ -175,7 +175,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
175 | 175 | ||
176 | /* load privat key */ | 176 | /* load privat key */ |
177 | char *hostkey_file; | 177 | char *hostkey_file; |
178 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 178 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
179 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
179 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 180 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
180 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 181 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
181 | GNUNET_free (hostkey_file); | 182 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_remove.c b/src/namestore/test_namestore_api_remove.c index 83e6529b8..89a6fab17 100644 --- a/src/namestore/test_namestore_api_remove.c +++ b/src/namestore/test_namestore_api_remove.c | |||
@@ -289,7 +289,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
289 | 289 | ||
290 | /* load privat key */ | 290 | /* load privat key */ |
291 | char *hostkey_file; | 291 | char *hostkey_file; |
292 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 292 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
293 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
293 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 294 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
294 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 295 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
295 | GNUNET_free (hostkey_file); | 296 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_remove_not_existing_record.c b/src/namestore/test_namestore_api_remove_not_existing_record.c index acac86539..c0ace7a20 100644 --- a/src/namestore/test_namestore_api_remove_not_existing_record.c +++ b/src/namestore/test_namestore_api_remove_not_existing_record.c | |||
@@ -223,7 +223,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
223 | 223 | ||
224 | /* load privat key */ | 224 | /* load privat key */ |
225 | char *hostkey_file; | 225 | char *hostkey_file; |
226 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 226 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
227 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
227 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 228 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
228 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 229 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
229 | GNUNET_free (hostkey_file); | 230 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_sign_verify.c b/src/namestore/test_namestore_api_sign_verify.c index def064b26..17bfb1eff 100644 --- a/src/namestore/test_namestore_api_sign_verify.c +++ b/src/namestore/test_namestore_api_sign_verify.c | |||
@@ -75,7 +75,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
75 | 75 | ||
76 | /* load privat key */ | 76 | /* load privat key */ |
77 | char *hostkey_file; | 77 | char *hostkey_file; |
78 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 78 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
79 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
79 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 80 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
80 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 81 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
81 | GNUNET_free (hostkey_file); | 82 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c index 043f35786..50aaeb470 100644 --- a/src/namestore/test_namestore_api_zone_iteration.c +++ b/src/namestore/test_namestore_api_zone_iteration.c | |||
@@ -405,7 +405,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
405 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL); | 405 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL); |
406 | 406 | ||
407 | char *hostkey_file; | 407 | char *hostkey_file; |
408 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 408 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
409 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
409 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 410 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
410 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 411 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
411 | GNUNET_free (hostkey_file); | 412 | GNUNET_free (hostkey_file); |
@@ -414,7 +415,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
414 | GNUNET_CRYPTO_hash(&pubkey, sizeof (pubkey), &zone); | 415 | GNUNET_CRYPTO_hash(&pubkey, sizeof (pubkey), &zone); |
415 | 416 | ||
416 | 417 | ||
417 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "KJI3AL00K91EDPFJF58DAJM7H61D189TLP70N56JL8SVDCJE1SJ3SNNBOQPPONTL37FMHPS39SMK2NMVC0GQMGA6QCMHITT78O8GF80.zkey"); | 418 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
419 | "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); | ||
418 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 420 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
419 | privkey2 = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 421 | privkey2 = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
420 | GNUNET_free (hostkey_file); | 422 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c index 550662e1f..4291b0630 100644 --- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c +++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c | |||
@@ -369,7 +369,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
369 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL); | 369 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL); |
370 | 370 | ||
371 | char *hostkey_file; | 371 | char *hostkey_file; |
372 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 372 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
373 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
373 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 374 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
374 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 375 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
375 | GNUNET_free (hostkey_file); | 376 | GNUNET_free (hostkey_file); |
@@ -377,7 +378,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
377 | GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey); | 378 | GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey); |
378 | GNUNET_CRYPTO_short_hash (&pubkey, sizeof (pubkey), &zone); | 379 | GNUNET_CRYPTO_short_hash (&pubkey, sizeof (pubkey), &zone); |
379 | 380 | ||
380 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "KJI3AL00K91EDPFJF58DAJM7H61D189TLP70N56JL8SVDCJE1SJ3SNNBOQPPONTL37FMHPS39SMK2NMVC0GQMGA6QCMHITT78O8GF80.zkey"); | 381 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
382 | "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); | ||
381 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 383 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
382 | privkey2 = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 384 | privkey2 = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
383 | GNUNET_free (hostkey_file); | 385 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index da75d46db..b48ab0781 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c | |||
@@ -419,7 +419,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
419 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL); | 419 | endbadly_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT,&endbadly, NULL); |
420 | 420 | ||
421 | char *hostkey_file; | 421 | char *hostkey_file; |
422 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 422 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
423 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
423 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 424 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
424 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 425 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
425 | GNUNET_free (hostkey_file); | 426 | GNUNET_free (hostkey_file); |
@@ -427,7 +428,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
427 | GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey); | 428 | GNUNET_CRYPTO_rsa_key_get_public(privkey, &pubkey); |
428 | GNUNET_CRYPTO_hash(&pubkey, sizeof (pubkey), &zone); | 429 | GNUNET_CRYPTO_hash(&pubkey, sizeof (pubkey), &zone); |
429 | 430 | ||
430 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "KJI3AL00K91EDPFJF58DAJM7H61D189TLP70N56JL8SVDCJE1SJ3SNNBOQPPONTL37FMHPS39SMK2NMVC0GQMGA6QCMHITT78O8GF80.zkey"); | 431 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
432 | "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); | ||
431 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 433 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
432 | privkey2 = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 434 | privkey2 = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
433 | GNUNET_free (hostkey_file); | 435 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index 6936142da..60168f82d 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c | |||
@@ -221,7 +221,8 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
221 | 221 | ||
222 | /* load privat key */ | 222 | /* load privat key */ |
223 | char *hostkey_file; | 223 | char *hostkey_file; |
224 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, "4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey"); | 224 | GNUNET_asprintf(&hostkey_file,"zonefiles%s%s",DIR_SEPARATOR_STR, |
225 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | ||
225 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 226 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
226 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); | 227 | privkey = GNUNET_CRYPTO_rsa_key_create_from_file(hostkey_file); |
227 | GNUNET_free (hostkey_file); | 228 | GNUNET_free (hostkey_file); |
diff --git a/src/namestore/zonefiles/4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey b/src/namestore/zonefiles/4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey deleted file mode 100644 index eac1d1e2f..000000000 --- a/src/namestore/zonefiles/4UCICULTINKC87UO4326KEEDQ9MTEP2AJT88MJFVGTGNK12QNGMQI2S41VI07UUU6EO19BTB06PDL0HE6VP1OM50HOJEI75RHP4JP80.zkey +++ /dev/null | |||
Binary files differ | |||
diff --git a/src/namestore/zonefiles/KJI3AL00K91EDPFJF58DAJM7H61D189TLP70N56JL8SVDCJE1SJ3SNNBOQPPONTL37FMHPS39SMK2NMVC0GQMGA6QCMHITT78O8GF80.zkey b/src/namestore/zonefiles/KJI3AL00K91EDPFJF58DAJM7H61D189TLP70N56JL8SVDCJE1SJ3SNNBOQPPONTL37FMHPS39SMK2NMVC0GQMGA6QCMHITT78O8GF80.zkey deleted file mode 100644 index 871fc90ed..000000000 --- a/src/namestore/zonefiles/KJI3AL00K91EDPFJF58DAJM7H61D189TLP70N56JL8SVDCJE1SJ3SNNBOQPPONTL37FMHPS39SMK2NMVC0GQMGA6QCMHITT78O8GF80.zkey +++ /dev/null | |||
Binary files differ | |||