diff options
| -rw-r--r-- | src/include/gnunet_namestore_plugin.h | 1 | ||||
| -rw-r--r-- | src/integration-tests/connection_watchdog.c | 3 | ||||
| -rw-r--r-- | src/namestore/namestore_api_common.c | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h index 512e463a8f..32d13e2003 100644 --- a/src/include/gnunet_namestore_plugin.h +++ b/src/include/gnunet_namestore_plugin.h @@ -26,7 +26,6 @@ #ifndef GNUNET_NAMESTORE_PLUGIN_H #define GNUNET_NAMESTORE_PLUGIN_H -#include "gnunet_common.h" #include "gnunet_util_lib.h" #include "gnunet_namestore_service.h" diff --git a/src/integration-tests/connection_watchdog.c b/src/integration-tests/connection_watchdog.c index cb34b69d79..c52ac79e7b 100644 --- a/src/integration-tests/connection_watchdog.c +++ b/src/integration-tests/connection_watchdog.c @@ -23,11 +23,10 @@ * @author Matthias Wachs */ #include "platform.h" -#include "gnunet_common.h" +#include "gnunet_util_lib.h" #include "gnunet_constants.h" #include "gnunet_arm_service.h" #include "gnunet_core_service.h" -#include "gnunet_util_lib.h" #include "gnunet_transport_service.h" #include "gnunet_statistics_service.h" diff --git a/src/namestore/namestore_api_common.c b/src/namestore/namestore_api_common.c index d54dc3e7f4..9026e8b619 100644 --- a/src/namestore/namestore_api_common.c +++ b/src/namestore/namestore_api_common.c @@ -509,7 +509,6 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type, const void *data, size_t data_size) { - struct GNUNET_CRYPTO_HashAsciiEncoded s_peer; const char *cdata; char* result; char tmp[INET6_ADDRSTRLEN]; @@ -650,10 +649,9 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type, ('\0' != cdata[data_size - 1]) ) return NULL; /* malformed */ vpn = data; - GNUNET_CRYPTO_hash_to_enc (&vpn->peer.hashPubKey, &s_peer); if (0 == GNUNET_asprintf (&vpn_str, "%u %s %s", (unsigned int) ntohs (vpn->proto), - (const char*) &s_peer, + (const char*) GNUNET_i2s_full (&vpn->peer), (const char*) &vpn[1])) { GNUNET_free (vpn_str); @@ -978,8 +976,9 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type, } *data_size = sizeof (struct GNUNET_TUN_GnsVpnRecord) + strlen (s_serv) + 1; *data = vpn = GNUNET_malloc (*data_size); - if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string ((char*)&s_peer, - &vpn->peer.hashPubKey)) + if (GNUNET_OK != GNUNET_CRYPTO_ecc_public_sign_key_from_string ((char*) s_peer, + strlen (s_peer), + &vpn->peer)) { GNUNET_free (vpn); *data_size = 0; |