diff options
Diffstat (limited to 'src/identity/gnunet-service-identity.c')
-rw-r--r-- | src/identity/gnunet-service-identity.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c index 07296a882..7ac4bf2b9 100644 --- a/src/identity/gnunet-service-identity.c +++ b/src/identity/gnunet-service-identity.c | |||
@@ -57,7 +57,7 @@ struct Ego | |||
57 | /** | 57 | /** |
58 | * Private key of the ego. | 58 | * Private key of the ego. |
59 | */ | 59 | */ |
60 | struct GNUNET_IDENTITY_PrivateKey pk; | 60 | struct GNUNET_CRYPTO_PrivateKey pk; |
61 | 61 | ||
62 | /** | 62 | /** |
63 | * String identifier for the ego. | 63 | * String identifier for the ego. |
@@ -238,7 +238,7 @@ create_update_message (struct Ego *ego) | |||
238 | size_t name_len; | 238 | size_t name_len; |
239 | ssize_t key_len; | 239 | ssize_t key_len; |
240 | 240 | ||
241 | key_len = GNUNET_IDENTITY_private_key_get_length (&ego->pk); | 241 | key_len = GNUNET_CRYPTO_private_key_get_length (&ego->pk); |
242 | name_len = (NULL == ego->identifier) ? 0 : (strlen (ego->identifier) + 1); | 242 | name_len = (NULL == ego->identifier) ? 0 : (strlen (ego->identifier) + 1); |
243 | env = GNUNET_MQ_msg_extra (um, name_len + key_len, | 243 | env = GNUNET_MQ_msg_extra (um, name_len + key_len, |
244 | GNUNET_MESSAGE_TYPE_IDENTITY_UPDATE); | 244 | GNUNET_MESSAGE_TYPE_IDENTITY_UPDATE); |
@@ -246,7 +246,7 @@ create_update_message (struct Ego *ego) | |||
246 | um->end_of_list = htons (GNUNET_NO); | 246 | um->end_of_list = htons (GNUNET_NO); |
247 | um->key_len = htons (key_len); | 247 | um->key_len = htons (key_len); |
248 | GNUNET_memcpy (&um[1], ego->identifier, name_len); | 248 | GNUNET_memcpy (&um[1], ego->identifier, name_len); |
249 | GNUNET_IDENTITY_write_private_key_to_buffer (&ego->pk, | 249 | GNUNET_CRYPTO_write_private_key_to_buffer (&ego->pk, |
250 | ((char*) &um[1]) + name_len, | 250 | ((char*) &um[1]) + name_len, |
251 | key_len); | 251 | key_len); |
252 | return env; | 252 | return env; |
@@ -422,7 +422,7 @@ notify_listeners (struct Ego *ego) | |||
422 | ssize_t key_len; | 422 | ssize_t key_len; |
423 | 423 | ||
424 | name_len = (NULL == ego->identifier) ? 0 : (strlen (ego->identifier) + 1); | 424 | name_len = (NULL == ego->identifier) ? 0 : (strlen (ego->identifier) + 1); |
425 | key_len = GNUNET_IDENTITY_private_key_get_length (&ego->pk); | 425 | key_len = GNUNET_CRYPTO_private_key_get_length (&ego->pk); |
426 | um = GNUNET_malloc (sizeof(struct UpdateMessage) + name_len + key_len); | 426 | um = GNUNET_malloc (sizeof(struct UpdateMessage) + name_len + key_len); |
427 | um->header.type = htons (GNUNET_MESSAGE_TYPE_IDENTITY_UPDATE); | 427 | um->header.type = htons (GNUNET_MESSAGE_TYPE_IDENTITY_UPDATE); |
428 | um->header.size = htons (sizeof(struct UpdateMessage) + name_len + key_len); | 428 | um->header.size = htons (sizeof(struct UpdateMessage) + name_len + key_len); |
@@ -430,7 +430,7 @@ notify_listeners (struct Ego *ego) | |||
430 | um->end_of_list = htons (GNUNET_NO); | 430 | um->end_of_list = htons (GNUNET_NO); |
431 | um->key_len = htons (key_len); | 431 | um->key_len = htons (key_len); |
432 | GNUNET_memcpy (&um[1], ego->identifier, name_len); | 432 | GNUNET_memcpy (&um[1], ego->identifier, name_len); |
433 | GNUNET_IDENTITY_write_private_key_to_buffer (&ego->pk, | 433 | GNUNET_CRYPTO_write_private_key_to_buffer (&ego->pk, |
434 | ((char*) &um[1]) + name_len, | 434 | ((char*) &um[1]) + name_len, |
435 | key_len); | 435 | key_len); |
436 | GNUNET_notification_context_broadcast (nc, &um->header, GNUNET_NO); | 436 | GNUNET_notification_context_broadcast (nc, &um->header, GNUNET_NO); |
@@ -487,7 +487,7 @@ static void | |||
487 | handle_create_message (void *cls, | 487 | handle_create_message (void *cls, |
488 | const struct CreateRequestMessage *crm) | 488 | const struct CreateRequestMessage *crm) |
489 | { | 489 | { |
490 | struct GNUNET_IDENTITY_PrivateKey private_key; | 490 | struct GNUNET_CRYPTO_PrivateKey private_key; |
491 | struct GNUNET_SERVICE_Client *client = cls; | 491 | struct GNUNET_SERVICE_Client *client = cls; |
492 | struct Ego *ego; | 492 | struct Ego *ego; |
493 | char *str; | 493 | char *str; |
@@ -498,7 +498,7 @@ handle_create_message (void *cls, | |||
498 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received CREATE message from client\n"); | 498 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received CREATE message from client\n"); |
499 | key_len = ntohs (crm->key_len); | 499 | key_len = ntohs (crm->key_len); |
500 | if ((GNUNET_SYSERR == | 500 | if ((GNUNET_SYSERR == |
501 | GNUNET_IDENTITY_read_private_key_from_buffer (&crm[1], | 501 | GNUNET_CRYPTO_read_private_key_from_buffer (&crm[1], |
502 | key_len, | 502 | key_len, |
503 | &private_key, | 503 | &private_key, |
504 | &kb_read)) || | 504 | &kb_read)) || |
@@ -531,7 +531,7 @@ handle_create_message (void *cls, | |||
531 | if (GNUNET_OK != | 531 | if (GNUNET_OK != |
532 | GNUNET_DISK_fn_write (fn, | 532 | GNUNET_DISK_fn_write (fn, |
533 | &private_key, | 533 | &private_key, |
534 | sizeof(struct GNUNET_IDENTITY_PrivateKey), | 534 | sizeof(struct GNUNET_CRYPTO_PrivateKey), |
535 | GNUNET_DISK_PERM_USER_READ | 535 | GNUNET_DISK_PERM_USER_READ |
536 | | GNUNET_DISK_PERM_USER_WRITE)) | 536 | | GNUNET_DISK_PERM_USER_WRITE)) |
537 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "write", fn); | 537 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "write", fn); |