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.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.c')
-rw-r--r-- | src/namestore/test_namestore_api_monitoring.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c index d0662617e..2d5888a5e 100644 --- a/src/namestore/test_namestore_api_monitoring.c +++ b/src/namestore/test_namestore_api_monitoring.c | |||
@@ -34,9 +34,9 @@ static struct GNUNET_NAMESTORE_Handle * nsh; | |||
34 | 34 | ||
35 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | 35 | static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; |
36 | 36 | ||
37 | static struct GNUNET_CRYPTO_EccPrivateKey * privkey; | 37 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey; |
38 | 38 | ||
39 | static struct GNUNET_CRYPTO_EccPrivateKey * privkey2; | 39 | static struct GNUNET_CRYPTO_EcdsaPrivateKey * privkey2; |
40 | 40 | ||
41 | static struct GNUNET_NAMESTORE_ZoneMonitor *zm; | 41 | static struct GNUNET_NAMESTORE_ZoneMonitor *zm; |
42 | 42 | ||
@@ -145,7 +145,7 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
145 | 145 | ||
146 | static void | 146 | static void |
147 | zone_proc (void *cls, | 147 | zone_proc (void *cls, |
148 | const struct GNUNET_CRYPTO_EccPrivateKey *zone_key, | 148 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key, |
149 | const char *name, | 149 | const char *name, |
150 | unsigned int rd_count, | 150 | unsigned int rd_count, |
151 | const struct GNUNET_NAMESTORE_RecordData *rd) | 151 | const struct GNUNET_NAMESTORE_RecordData *rd) |
@@ -156,7 +156,7 @@ zone_proc (void *cls, | |||
156 | "Comparing results name %s\n", | 156 | "Comparing results name %s\n", |
157 | name); | 157 | name); |
158 | 158 | ||
159 | if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EccPrivateKey))) | 159 | if (0 != memcmp (zone_key, privkey, sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey))) |
160 | { | 160 | { |
161 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 161 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
162 | "Monitoring returned wrong zone key\n"); | 162 | "Monitoring returned wrong zone key\n"); |
@@ -268,7 +268,7 @@ run (void *cls, | |||
268 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | 268 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); |
269 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 269 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
270 | "Using zonekey file `%s' \n", hostkey_file); | 270 | "Using zonekey file `%s' \n", hostkey_file); |
271 | privkey = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); | 271 | privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); |
272 | GNUNET_free (hostkey_file); | 272 | GNUNET_free (hostkey_file); |
273 | GNUNET_assert (privkey != NULL); | 273 | GNUNET_assert (privkey != NULL); |
274 | 274 | ||
@@ -301,7 +301,7 @@ run (void *cls, | |||
301 | DIR_SEPARATOR_STR, | 301 | DIR_SEPARATOR_STR, |
302 | "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); | 302 | "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); |
303 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); | 303 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using zonekey file `%s' \n", hostkey_file); |
304 | privkey2 = GNUNET_CRYPTO_ecc_key_create_from_file(hostkey_file); | 304 | privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); |
305 | GNUNET_free (hostkey_file); | 305 | GNUNET_free (hostkey_file); |
306 | GNUNET_assert (privkey2 != NULL); | 306 | GNUNET_assert (privkey2 != NULL); |
307 | 307 | ||