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/fs/fs_unindex.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/fs/fs_unindex.c')
-rw-r--r-- | src/fs/fs_unindex.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c index 7e189d697..14ab0fd69 100644 --- a/src/fs/fs_unindex.c +++ b/src/fs/fs_unindex.c | |||
@@ -490,10 +490,10 @@ process_kblock_for_unindex (void *cls, | |||
490 | } | 490 | } |
491 | { | 491 | { |
492 | char pt[size - sizeof (struct UBlock)]; | 492 | char pt[size - sizeof (struct UBlock)]; |
493 | struct GNUNET_CRYPTO_EccPublicSignKey anon_pub; | 493 | struct GNUNET_CRYPTO_EcdsaPublicKey anon_pub; |
494 | const char *keyword; | 494 | const char *keyword; |
495 | 495 | ||
496 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (GNUNET_CRYPTO_ecc_key_get_anonymous (), | 496 | GNUNET_CRYPTO_ecdsa_key_get_public (GNUNET_CRYPTO_ecdsa_key_get_anonymous (), |
497 | &anon_pub); | 497 | &anon_pub); |
498 | keyword = &uc->ksk_uri->data.ksk.keywords[uc->ksk_offset][1]; | 498 | keyword = &uc->ksk_uri->data.ksk.keywords[uc->ksk_offset][1]; |
499 | GNUNET_FS_ublock_decrypt_ (&ub[1], size - sizeof (struct UBlock), | 499 | GNUNET_FS_ublock_decrypt_ (&ub[1], size - sizeof (struct UBlock), |
@@ -550,9 +550,9 @@ void | |||
550 | GNUNET_FS_unindex_do_remove_kblocks_ (struct GNUNET_FS_UnindexContext *uc) | 550 | GNUNET_FS_unindex_do_remove_kblocks_ (struct GNUNET_FS_UnindexContext *uc) |
551 | { | 551 | { |
552 | const char *keyword; | 552 | const char *keyword; |
553 | const struct GNUNET_CRYPTO_EccPrivateKey *anon; | 553 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *anon; |
554 | struct GNUNET_CRYPTO_EccPublicSignKey anon_pub; | 554 | struct GNUNET_CRYPTO_EcdsaPublicKey anon_pub; |
555 | struct GNUNET_CRYPTO_EccPublicSignKey dpub; | 555 | struct GNUNET_CRYPTO_EcdsaPublicKey dpub; |
556 | 556 | ||
557 | if (NULL == uc->dsh) | 557 | if (NULL == uc->dsh) |
558 | uc->dsh = GNUNET_DATASTORE_connect (uc->h->cfg); | 558 | uc->dsh = GNUNET_DATASTORE_connect (uc->h->cfg); |
@@ -570,10 +570,10 @@ GNUNET_FS_unindex_do_remove_kblocks_ (struct GNUNET_FS_UnindexContext *uc) | |||
570 | unindex_finish (uc); | 570 | unindex_finish (uc); |
571 | return; | 571 | return; |
572 | } | 572 | } |
573 | anon = GNUNET_CRYPTO_ecc_key_get_anonymous (); | 573 | anon = GNUNET_CRYPTO_ecdsa_key_get_anonymous (); |
574 | GNUNET_CRYPTO_ecc_key_get_public_for_signature (anon, &anon_pub); | 574 | GNUNET_CRYPTO_ecdsa_key_get_public (anon, &anon_pub); |
575 | keyword = &uc->ksk_uri->data.ksk.keywords[uc->ksk_offset][1]; | 575 | keyword = &uc->ksk_uri->data.ksk.keywords[uc->ksk_offset][1]; |
576 | GNUNET_CRYPTO_ecc_public_key_derive (&anon_pub, | 576 | GNUNET_CRYPTO_ecdsa_public_key_derive (&anon_pub, |
577 | keyword, | 577 | keyword, |
578 | "fs-ublock", | 578 | "fs-ublock", |
579 | &dpub); | 579 | &dpub); |