diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-10 14:38:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-10 14:38:55 +0000 |
commit | 9351b1e9bdf2b067b6db06562c26ba658cff42b8 (patch) | |
tree | 68dc4ab447e7e8b6a20a706858cd36238c1c7c5f /src/namestore/test_namestore_api_monitoring_existing.c | |
parent | 8beabcd96c0cf1e1873c0b5ff96e537f1beb0b34 (diff) | |
download | gnunet-9351b1e9bdf2b067b6db06562c26ba658cff42b8.tar.gz gnunet-9351b1e9bdf2b067b6db06562c26ba658cff42b8.zip |
separating ECC crypto into functions/structs for ECDHE, ECDSA and EDDSA
Diffstat (limited to 'src/namestore/test_namestore_api_monitoring_existing.c')
-rw-r--r-- | src/namestore/test_namestore_api_monitoring_existing.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/namestore/test_namestore_api_monitoring_existing.c b/src/namestore/test_namestore_api_monitoring_existing.c index 4db1c6d62..3b2ca6092 100644 --- a/src/namestore/test_namestore_api_monitoring_existing.c +++ b/src/namestore/test_namestore_api_monitoring_existing.c | |||
@@ -35,9 +35,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh; | |||
35 | 35 | ||
36 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 36 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; |
37 | 37 | ||
38 | static struct GNUNET_CRYPTO_EccPrivateKey * privkey; | 38 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; |
39 | 39 | ||
40 | static struct GNUNET_CRYPTO_EccPrivateKey * privkey2; | 40 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2; |
41 | 41 | ||
42 | static struct GNUNET_NAMESTORE_ZoneMonitor *zm; | 42 | static struct GNUNET_NAMESTORE_ZoneMonitor *zm; |
43 | 43 | ||
@@ -146,7 +146,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
146 | 146 | ||
147 | static void | 147 | static void |
148 | zone_proc (void *cls, | 148 | zone_proc (void *cls, |
149 | const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, | 149 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, |
150 | const char *name, | 150 | const char *name, |
151 | unsigned int rd_count, | 151 | unsigned int rd_count, |
152 | const struct GNUNET_NAMESTORE_RecordData *rd) | 152 | const struct GNUNET_NAMESTORE_RecordData *rd) |
@@ -157,7 +157,7 @@ zone_proc (void *cls, | |||
157 | "Comparing results name %s\n", | 157 | "Comparing results name %s\n", |
158 | name); | 158 | name); |
159 | 159 | ||
160 | if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) | 160 | if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) |
161 | { | 161 | { |
162 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 162 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
163 | "Monitoring returned wrong zone key\n"); | 163 | "Monitoring returned wrong zone key\n"); |
@@ -286,7 +286,7 @@ run (void *cls, | |||
286 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | 286 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); |
287 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 287 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
288 | "Using zonekey file `%s' \n", hostkey_file); | 288 | "Using zonekey file `%s' \n", hostkey_file); |
289 | privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); | 289 | privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); |
290 | GNUNET_free (hostkey_file); | 290 | GNUNET_free (hostkey_file); |
291 | GNUNET_assert (privkey != NULL); | 291 | GNUNET_assert (privkey != NULL); |
292 | 292 | ||
@@ -306,7 +306,7 @@ run (void *cls, | |||
306 | DIR_SEPARATOR_STR, | 306 | DIR_SEPARATOR_STR, |
307 | "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); | 307 | "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); |
308 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 308 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
309 | privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); | 309 | privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); |
310 | GNUNET_free (hostkey_file); | 310 | GNUNET_free (hostkey_file); |
311 | GNUNET_assert (privkey2 != NULL); | 311 | GNUNET_assert (privkey2 != NULL); |
312 | 312 | ||