aboutsummaryrefslogtreecommitdiff
path: root/src/messenger/messenger_api_contact_store.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/messenger/messenger_api_contact_store.c')
-rw-r--r--src/messenger/messenger_api_contact_store.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/messenger/messenger_api_contact_store.c b/src/messenger/messenger_api_contact_store.c
index d42155e20..b0e0d026b 100644
--- a/src/messenger/messenger_api_contact_store.c
+++ b/src/messenger/messenger_api_contact_store.c
@@ -65,7 +65,7 @@ select_store_contact_map (struct GNUNET_MESSENGER_ContactStore *store,
65 const struct GNUNET_HashCode *context, 65 const struct GNUNET_HashCode *context,
66 struct GNUNET_HashCode *hash) 66 struct GNUNET_HashCode *hash)
67{ 67{
68 const struct GNUNET_IDENTITY_PublicKey *anonymous = get_anonymous_public_key (); 68 const struct GNUNET_CRYPTO_PublicKey *anonymous = get_anonymous_public_key ();
69 69
70 struct GNUNET_HashCode anonHash; 70 struct GNUNET_HashCode anonHash;
71 GNUNET_CRYPTO_hash (anonymous, sizeof(*anonymous), &anonHash); 71 GNUNET_CRYPTO_hash (anonymous, sizeof(*anonymous), &anonHash);
@@ -99,7 +99,7 @@ get_store_contact_raw (struct GNUNET_MESSENGER_ContactStore *store,
99struct GNUNET_MESSENGER_Contact* 99struct GNUNET_MESSENGER_Contact*
100get_store_contact (struct GNUNET_MESSENGER_ContactStore *store, 100get_store_contact (struct GNUNET_MESSENGER_ContactStore *store,
101 const struct GNUNET_HashCode *context, 101 const struct GNUNET_HashCode *context,
102 const struct GNUNET_IDENTITY_PublicKey *pubkey) 102 const struct GNUNET_CRYPTO_PublicKey *pubkey)
103{ 103{
104 GNUNET_assert ((store) && (store->contacts) && (context) && (pubkey)); 104 GNUNET_assert ((store) && (store->contacts) && (context) && (pubkey));
105 105
@@ -116,7 +116,7 @@ get_store_contact (struct GNUNET_MESSENGER_ContactStore *store,
116 { 116 {
117 if (0 != GNUNET_memcmp(pubkey, get_contact_key(contact))) 117 if (0 != GNUNET_memcmp(pubkey, get_contact_key(contact)))
118 { 118 {
119 char* str = GNUNET_IDENTITY_public_key_to_string (get_contact_key(contact)); 119 char* str = GNUNET_CRYPTO_public_key_to_string (get_contact_key(contact));
120 GNUNET_log (GNUNET_ERROR_TYPE_INVALID, "Contact in store uses wrong key: %s\n", str); 120 GNUNET_log (GNUNET_ERROR_TYPE_INVALID, "Contact in store uses wrong key: %s\n", str);
121 GNUNET_free (str); 121 GNUNET_free (str);
122 return NULL; 122 return NULL;
@@ -140,11 +140,11 @@ update_store_contact (struct GNUNET_MESSENGER_ContactStore *store,
140 struct GNUNET_MESSENGER_Contact* contact, 140 struct GNUNET_MESSENGER_Contact* contact,
141 const struct GNUNET_HashCode *context, 141 const struct GNUNET_HashCode *context,
142 const struct GNUNET_HashCode *next_context, 142 const struct GNUNET_HashCode *next_context,
143 const struct GNUNET_IDENTITY_PublicKey *pubkey) 143 const struct GNUNET_CRYPTO_PublicKey *pubkey)
144{ 144{
145 GNUNET_assert ((store) && (store->contacts) && (contact) && (pubkey)); 145 GNUNET_assert ((store) && (store->contacts) && (contact) && (pubkey));
146 146
147 const struct GNUNET_IDENTITY_PublicKey* oldkey = get_contact_key (contact); 147 const struct GNUNET_CRYPTO_PublicKey* oldkey = get_contact_key (contact);
148 148
149 struct GNUNET_HashCode hash; 149 struct GNUNET_HashCode hash;
150 GNUNET_CRYPTO_hash (oldkey, sizeof(*oldkey), &hash); 150 GNUNET_CRYPTO_hash (oldkey, sizeof(*oldkey), &hash);
@@ -177,7 +177,7 @@ remove_store_contact (struct GNUNET_MESSENGER_ContactStore *store,
177{ 177{
178 GNUNET_assert ((store) && (store->contacts) && (contact)); 178 GNUNET_assert ((store) && (store->contacts) && (contact));
179 179
180 const struct GNUNET_IDENTITY_PublicKey* pubkey = get_contact_key(contact); 180 const struct GNUNET_CRYPTO_PublicKey* pubkey = get_contact_key(contact);
181 181
182 struct GNUNET_HashCode hash; 182 struct GNUNET_HashCode hash;
183 GNUNET_CRYPTO_hash (pubkey, sizeof(*pubkey), &hash); 183 GNUNET_CRYPTO_hash (pubkey, sizeof(*pubkey), &hash);