diff options
Diffstat (limited to 'src/setup/gnunet-setup-gns.c')
-rw-r--r-- | src/setup/gnunet-setup-gns.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c index 13a089c7..36cca3d0 100644 --- a/src/setup/gnunet-setup-gns.c +++ b/src/setup/gnunet-setup-gns.c | |||
@@ -350,7 +350,7 @@ static struct GNUNET_CRYPTO_EccPrivateKey *pkey; | |||
350 | /** | 350 | /** |
351 | * Public key of the zone we are currently editing. | 351 | * Public key of the zone we are currently editing. |
352 | */ | 352 | */ |
353 | static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey; | 353 | static struct GNUNET_CRYPTO_EccPublicKey pubkey; |
354 | 354 | ||
355 | /** | 355 | /** |
356 | * Short hash of the public key of the zone we are currently editing. | 356 | * Short hash of the public key of the zone we are currently editing. |
@@ -781,7 +781,7 @@ free_edit_dialog_context (struct EditDialogContext *edc) | |||
781 | */ | 781 | */ |
782 | static void | 782 | static void |
783 | merge_with_existing_records (void *cls, | 783 | merge_with_existing_records (void *cls, |
784 | const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key, | 784 | const struct GNUNET_CRYPTO_EccPublicKey *zone_key, |
785 | struct GNUNET_TIME_Absolute freshness, | 785 | struct GNUNET_TIME_Absolute freshness, |
786 | const char *name, | 786 | const char *name, |
787 | unsigned int rd_count, | 787 | unsigned int rd_count, |
@@ -946,7 +946,7 @@ edit_dialog_continuation (struct EditDialogContext *edc, | |||
946 | struct GNUNET_CRYPTO_EccPrivateKey *pk; | 946 | struct GNUNET_CRYPTO_EccPrivateKey *pk; |
947 | struct MoveOperationContext *moc; | 947 | struct MoveOperationContext *moc; |
948 | struct GNUNET_CRYPTO_ShortHashCode target_zone_hash; | 948 | struct GNUNET_CRYPTO_ShortHashCode target_zone_hash; |
949 | struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pubkey; | 949 | struct GNUNET_CRYPTO_EccPublicKey pubkey; |
950 | 950 | ||
951 | /* determine target zone */ | 951 | /* determine target zone */ |
952 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, | 952 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, |
@@ -973,7 +973,7 @@ edit_dialog_continuation (struct EditDialogContext *edc, | |||
973 | } | 973 | } |
974 | GNUNET_CRYPTO_ecc_key_get_public (pk, &pubkey); | 974 | GNUNET_CRYPTO_ecc_key_get_public (pk, &pubkey); |
975 | GNUNET_CRYPTO_short_hash (&pubkey, | 975 | GNUNET_CRYPTO_short_hash (&pubkey, |
976 | sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), | 976 | sizeof (struct GNUNET_CRYPTO_EccPublicKey), |
977 | &target_zone_hash); | 977 | &target_zone_hash); |
978 | moc = GNUNET_new (struct MoveOperationContext); | 978 | moc = GNUNET_new (struct MoveOperationContext); |
979 | moc->data = data; | 979 | moc->data = data; |
@@ -1713,7 +1713,7 @@ zone_sync_proc (void *cls) | |||
1713 | */ | 1713 | */ |
1714 | static void | 1714 | static void |
1715 | zone_iteration_proc (void *cls, | 1715 | zone_iteration_proc (void *cls, |
1716 | const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key, | 1716 | const struct GNUNET_CRYPTO_EccPublicKey *zone_key, |
1717 | struct GNUNET_TIME_Absolute expire, | 1717 | struct GNUNET_TIME_Absolute expire, |
1718 | const char *name, | 1718 | const char *name, |
1719 | unsigned int rd_count, | 1719 | unsigned int rd_count, |
@@ -1959,7 +1959,7 @@ load_zone (const char *zonename) | |||
1959 | pkey = pk; | 1959 | pkey = pk; |
1960 | GNUNET_CRYPTO_ecc_key_get_public (pkey, &pubkey); | 1960 | GNUNET_CRYPTO_ecc_key_get_public (pkey, &pubkey); |
1961 | GNUNET_CRYPTO_short_hash (&pubkey, | 1961 | GNUNET_CRYPTO_short_hash (&pubkey, |
1962 | sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), | 1962 | sizeof (struct GNUNET_CRYPTO_EccPublicKey), |
1963 | &zone); | 1963 | &zone); |
1964 | GNUNET_CRYPTO_short_hash_to_enc(&zone, &shenc); | 1964 | GNUNET_CRYPTO_short_hash_to_enc(&zone, &shenc); |
1965 | 1965 | ||