aboutsummaryrefslogtreecommitdiff
path: root/src/fs/test_fs_namespace.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-10 14:38:55 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-10 14:38:55 +0000
commit9351b1e9bdf2b067b6db06562c26ba658cff42b8 (patch)
tree68dc4ab447e7e8b6a20a706858cd36238c1c7c5f /src/fs/test_fs_namespace.c
parent8beabcd96c0cf1e1873c0b5ff96e537f1beb0b34 (diff)
downloadgnunet-9351b1e9bdf2b067b6db06562c26ba658cff42b8.tar.gz
gnunet-9351b1e9bdf2b067b6db06562c26ba658cff42b8.zip
separating ECC crypto into functions/structs for ECDHE, ECDSA and EDDSA
Diffstat (limited to 'src/fs/test_fs_namespace.c')
-rw-r--r--src/fs/test_fs_namespace.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index b0358e809..c78008122 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -29,7 +29,7 @@
29#include "gnunet_fs_service.h" 29#include "gnunet_fs_service.h"
30 30
31 31
32static struct GNUNET_CRYPTO_EccPublicSignKey nsid; 32static struct GNUNET_CRYPTO_EcdsaPublicKey nsid;
33 33
34static struct GNUNET_FS_Uri *sks_expect_uri; 34static struct GNUNET_FS_Uri *sks_expect_uri;
35 35
@@ -237,7 +237,7 @@ static void
237adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg) 237adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
238{ 238{
239 struct GNUNET_CONTAINER_MetaData *meta; 239 struct GNUNET_CONTAINER_MetaData *meta;
240 struct GNUNET_CRYPTO_EccPrivateKey *ns; 240 struct GNUNET_CRYPTO_EcdsaPrivateKey *ns;
241 struct GNUNET_FS_BlockOptions bo; 241 struct GNUNET_FS_BlockOptions bo;
242 242
243 if (NULL != emsg) 243 if (NULL != emsg)
@@ -247,7 +247,7 @@ adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
247 GNUNET_FS_stop (fs); 247 GNUNET_FS_stop (fs);
248 return; 248 return;
249 } 249 }
250 ns = GNUNET_CRYPTO_ecc_key_create (); 250 ns = GNUNET_CRYPTO_ecdsa_key_create ();
251 meta = GNUNET_CONTAINER_meta_data_create (); 251 meta = GNUNET_CONTAINER_meta_data_create ();
252 sks_expect_uri = GNUNET_FS_uri_dup (uri); 252 sks_expect_uri = GNUNET_FS_uri_dup (uri);
253 bo.content_priority = 1; 253 bo.content_priority = 1;
@@ -255,7 +255,7 @@ adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
255 bo.replication_level = 0; 255 bo.replication_level = 0;
256 bo.expiration_time = 256 bo.expiration_time =
257 GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES); 257 GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_MINUTES);
258 GNUNET_CRYPTO_ecc_key_get_public_for_signature (ns, &nsid); 258 GNUNET_CRYPTO_ecdsa_key_get_public (ns, &nsid);
259 GNUNET_FS_publish_sks (fs, ns, "this", "next", meta, uri, 259 GNUNET_FS_publish_sks (fs, ns, "this", "next", meta, uri,
260 &bo, GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont, NULL); 260 &bo, GNUNET_FS_PUBLISH_OPTION_NONE, &sks_cont, NULL);
261 GNUNET_CONTAINER_meta_data_destroy (meta); 261 GNUNET_CONTAINER_meta_data_destroy (meta);
@@ -266,13 +266,13 @@ adv_cont (void *cls, const struct GNUNET_FS_Uri *uri, const char *emsg)
266static void 266static void
267testNamespace () 267testNamespace ()
268{ 268{
269 struct GNUNET_CRYPTO_EccPrivateKey *ns; 269 struct GNUNET_CRYPTO_EcdsaPrivateKey *ns;
270 struct GNUNET_FS_BlockOptions bo; 270 struct GNUNET_FS_BlockOptions bo;
271 struct GNUNET_CONTAINER_MetaData *meta; 271 struct GNUNET_CONTAINER_MetaData *meta;
272 struct GNUNET_FS_Uri *ksk_uri; 272 struct GNUNET_FS_Uri *ksk_uri;
273 struct GNUNET_FS_Uri *sks_uri; 273 struct GNUNET_FS_Uri *sks_uri;
274 274
275 ns = GNUNET_CRYPTO_ecc_key_create (); 275 ns = GNUNET_CRYPTO_ecdsa_key_create ();
276 meta = GNUNET_CONTAINER_meta_data_create (); 276 meta = GNUNET_CONTAINER_meta_data_create ();
277 ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/testnsa", NULL); 277 ksk_uri = GNUNET_FS_uri_parse ("gnunet://fs/ksk/testnsa", NULL);
278 bo.content_priority = 1; 278 bo.content_priority = 1;