diff options
Diffstat (limited to 'src/conversation')
-rw-r--r-- | src/conversation/conversation_api.c | 4 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation.c | 6 | ||||
-rw-r--r-- | src/conversation/test_conversation_api.c | 8 | ||||
-rw-r--r-- | src/conversation/test_conversation_api_reject.c | 8 | ||||
-rw-r--r-- | src/conversation/test_conversation_api_twocalls.c | 8 |
5 files changed, 17 insertions, 17 deletions
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c index daf51042a..88fe8f11c 100644 --- a/src/conversation/conversation_api.c +++ b/src/conversation/conversation_api.c | |||
@@ -105,7 +105,7 @@ struct GNUNET_CONVERSATION_Caller | |||
105 | /** | 105 | /** |
106 | * Identity of the person calling us. | 106 | * Identity of the person calling us. |
107 | */ | 107 | */ |
108 | struct GNUNET_CRYPTO_EcdsaPublicKey caller_id; | 108 | struct GNUNET_IDENTITY_PublicKey caller_id; |
109 | 109 | ||
110 | /** | 110 | /** |
111 | * Internal handle to identify the caller with the service. | 111 | * Internal handle to identify the caller with the service. |
@@ -192,7 +192,7 @@ struct GNUNET_CONVERSATION_Phone | |||
192 | /** | 192 | /** |
193 | * My GNS zone. | 193 | * My GNS zone. |
194 | */ | 194 | */ |
195 | struct GNUNET_CRYPTO_EcdsaPrivateKey my_zone; | 195 | struct GNUNET_IDENTITY_PrivateKey my_zone; |
196 | 196 | ||
197 | /** | 197 | /** |
198 | * State machine for the phone. | 198 | * State machine for the phone. |
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c index 7a2a727a5..9ff0002e7 100644 --- a/src/conversation/gnunet-conversation.c +++ b/src/conversation/gnunet-conversation.c | |||
@@ -116,7 +116,7 @@ struct CallList | |||
116 | /** | 116 | /** |
117 | * Public key identifying the caller. | 117 | * Public key identifying the caller. |
118 | */ | 118 | */ |
119 | struct GNUNET_CRYPTO_EcdsaPublicKey caller_id; | 119 | struct GNUNET_IDENTITY_PublicKey caller_id; |
120 | 120 | ||
121 | /** | 121 | /** |
122 | * Unique number of the call. | 122 | * Unique number of the call. |
@@ -194,7 +194,7 @@ static char *ego_name; | |||
194 | /** | 194 | /** |
195 | * Public key of active conversation partner (if any). | 195 | * Public key of active conversation partner (if any). |
196 | */ | 196 | */ |
197 | static struct GNUNET_CRYPTO_EcdsaPublicKey peer_key; | 197 | static struct GNUNET_IDENTITY_PublicKey peer_key; |
198 | 198 | ||
199 | /** | 199 | /** |
200 | * Name of active conversation partner (if any). | 200 | * Name of active conversation partner (if any). |
@@ -244,7 +244,7 @@ static void | |||
244 | phone_event_handler (void *cls, | 244 | phone_event_handler (void *cls, |
245 | enum GNUNET_CONVERSATION_PhoneEventCode code, | 245 | enum GNUNET_CONVERSATION_PhoneEventCode code, |
246 | struct GNUNET_CONVERSATION_Caller *caller, | 246 | struct GNUNET_CONVERSATION_Caller *caller, |
247 | const struct GNUNET_CRYPTO_EcdsaPublicKey *caller_id) | 247 | const struct GNUNET_IDENTITY_PublicKey *caller_id) |
248 | { | 248 | { |
249 | struct CallList *cl; | 249 | struct CallList *cl; |
250 | 250 | ||
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c index b51186dc8..c5efecd52 100644 --- a/src/conversation/test_conversation_api.c +++ b/src/conversation/test_conversation_api.c | |||
@@ -305,7 +305,7 @@ static void | |||
305 | phone_event_handler (void *cls, | 305 | phone_event_handler (void *cls, |
306 | enum GNUNET_CONVERSATION_PhoneEventCode code, | 306 | enum GNUNET_CONVERSATION_PhoneEventCode code, |
307 | struct GNUNET_CONVERSATION_Caller *caller, | 307 | struct GNUNET_CONVERSATION_Caller *caller, |
308 | const struct GNUNET_CRYPTO_EcdsaPublicKey *caller_id) | 308 | const struct GNUNET_IDENTITY_PublicKey *caller_id) |
309 | { | 309 | { |
310 | static enum GNUNET_CONVERSATION_PhoneEventCode expect = | 310 | static enum GNUNET_CONVERSATION_PhoneEventCode expect = |
311 | GNUNET_CONVERSATION_EC_PHONE_RING; | 311 | GNUNET_CONVERSATION_EC_PHONE_RING; |
@@ -385,7 +385,7 @@ call_event_handler (void *cls, enum GNUNET_CONVERSATION_CallEventCode code) | |||
385 | 385 | ||
386 | static void | 386 | static void |
387 | caller_ego_create_cont (void *cls, | 387 | caller_ego_create_cont (void *cls, |
388 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk, | 388 | const struct GNUNET_IDENTITY_PrivateKey *pk, |
389 | const char *emsg) | 389 | const char *emsg) |
390 | { | 390 | { |
391 | (void) cls; | 391 | (void) cls; |
@@ -414,7 +414,7 @@ identity_cb (void *cls, | |||
414 | const char *name) | 414 | const char *name) |
415 | { | 415 | { |
416 | struct GNUNET_GNSRECORD_Data rd; | 416 | struct GNUNET_GNSRECORD_Data rd; |
417 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 417 | struct GNUNET_IDENTITY_PublicKey pub; |
418 | 418 | ||
419 | (void) cls; | 419 | (void) cls; |
420 | (void) ctx; | 420 | (void) ctx; |
@@ -465,7 +465,7 @@ identity_cb (void *cls, | |||
465 | 465 | ||
466 | static void | 466 | static void |
467 | phone_ego_create_cont (void *cls, | 467 | phone_ego_create_cont (void *cls, |
468 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk, | 468 | const struct GNUNET_IDENTITY_PrivateKey *pk, |
469 | const char *emsg) | 469 | const char *emsg) |
470 | { | 470 | { |
471 | (void) cls; | 471 | (void) cls; |
diff --git a/src/conversation/test_conversation_api_reject.c b/src/conversation/test_conversation_api_reject.c index 69fa9f1dc..08c64df37 100644 --- a/src/conversation/test_conversation_api_reject.c +++ b/src/conversation/test_conversation_api_reject.c | |||
@@ -179,7 +179,7 @@ static void | |||
179 | phone_event_handler (void *cls, | 179 | phone_event_handler (void *cls, |
180 | enum GNUNET_CONVERSATION_PhoneEventCode code, | 180 | enum GNUNET_CONVERSATION_PhoneEventCode code, |
181 | struct GNUNET_CONVERSATION_Caller *caller, | 181 | struct GNUNET_CONVERSATION_Caller *caller, |
182 | const struct GNUNET_CRYPTO_EcdsaPublicKey *caller_id) | 182 | const struct GNUNET_IDENTITY_PublicKey *caller_id) |
183 | { | 183 | { |
184 | static enum GNUNET_CONVERSATION_PhoneEventCode expect = | 184 | static enum GNUNET_CONVERSATION_PhoneEventCode expect = |
185 | GNUNET_CONVERSATION_EC_PHONE_RING; | 185 | GNUNET_CONVERSATION_EC_PHONE_RING; |
@@ -238,7 +238,7 @@ call_event_handler (void *cls, enum GNUNET_CONVERSATION_CallEventCode code) | |||
238 | 238 | ||
239 | static void | 239 | static void |
240 | caller_ego_create_cont (void *cls, | 240 | caller_ego_create_cont (void *cls, |
241 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk, | 241 | const struct GNUNET_IDENTITY_PrivateKey *pk, |
242 | const char *emsg) | 242 | const char *emsg) |
243 | { | 243 | { |
244 | (void) cls; | 244 | (void) cls; |
@@ -267,7 +267,7 @@ identity_cb (void *cls, | |||
267 | const char *name) | 267 | const char *name) |
268 | { | 268 | { |
269 | struct GNUNET_GNSRECORD_Data rd; | 269 | struct GNUNET_GNSRECORD_Data rd; |
270 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 270 | struct GNUNET_IDENTITY_PublicKey pub; |
271 | 271 | ||
272 | (void) cls; | 272 | (void) cls; |
273 | (void) ctx; | 273 | (void) ctx; |
@@ -318,7 +318,7 @@ identity_cb (void *cls, | |||
318 | 318 | ||
319 | static void | 319 | static void |
320 | phone_ego_create_cont (void *cls, | 320 | phone_ego_create_cont (void *cls, |
321 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk, | 321 | const struct GNUNET_IDENTITY_PrivateKey *pk, |
322 | const char *emsg) | 322 | const char *emsg) |
323 | { | 323 | { |
324 | (void) cls; | 324 | (void) cls; |
diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c index 83e8cb55a..ac7a3c9dd 100644 --- a/src/conversation/test_conversation_api_twocalls.c +++ b/src/conversation/test_conversation_api_twocalls.c | |||
@@ -403,7 +403,7 @@ static void | |||
403 | phone_event_handler (void *cls, | 403 | phone_event_handler (void *cls, |
404 | enum GNUNET_CONVERSATION_PhoneEventCode code, | 404 | enum GNUNET_CONVERSATION_PhoneEventCode code, |
405 | struct GNUNET_CONVERSATION_Caller *caller, | 405 | struct GNUNET_CONVERSATION_Caller *caller, |
406 | const struct GNUNET_CRYPTO_EcdsaPublicKey *caller_id) | 406 | const struct GNUNET_IDENTITY_PublicKey *caller_id) |
407 | { | 407 | { |
408 | const char *cid; | 408 | const char *cid; |
409 | 409 | ||
@@ -507,7 +507,7 @@ call_event_handler (void *cls, enum GNUNET_CONVERSATION_CallEventCode code) | |||
507 | 507 | ||
508 | static void | 508 | static void |
509 | caller_ego_create_cont (void *cls, | 509 | caller_ego_create_cont (void *cls, |
510 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk, | 510 | const struct GNUNET_IDENTITY_PrivateKey *pk, |
511 | const char *emsg) | 511 | const char *emsg) |
512 | { | 512 | { |
513 | (void) cls; | 513 | (void) cls; |
@@ -536,7 +536,7 @@ identity_cb (void *cls, | |||
536 | const char *name) | 536 | const char *name) |
537 | { | 537 | { |
538 | struct GNUNET_GNSRECORD_Data rd; | 538 | struct GNUNET_GNSRECORD_Data rd; |
539 | struct GNUNET_CRYPTO_EcdsaPublicKey pub; | 539 | struct GNUNET_IDENTITY_PublicKey pub; |
540 | 540 | ||
541 | (void) cls; | 541 | (void) cls; |
542 | (void) ctx; | 542 | (void) ctx; |
@@ -594,7 +594,7 @@ identity_cb (void *cls, | |||
594 | 594 | ||
595 | static void | 595 | static void |
596 | phone_ego_create_cont (void *cls, | 596 | phone_ego_create_cont (void *cls, |
597 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *pk, | 597 | const struct GNUNET_IDENTITY_PrivateKey *pk, |
598 | const char *emsg) | 598 | const char *emsg) |
599 | { | 599 | { |
600 | (void) cls; | 600 | (void) cls; |