diff options
Diffstat (limited to 'src/messenger/messenger_api_message.c')
-rw-r--r-- | src/messenger/messenger_api_message.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/messenger/messenger_api_message.c b/src/messenger/messenger_api_message.c index facd7b093..c7364d51c 100644 --- a/src/messenger/messenger_api_message.c +++ b/src/messenger/messenger_api_message.c | |||
@@ -56,8 +56,8 @@ create_message (enum GNUNET_MESSENGER_MessageKind kind) | |||
56 | message->body.file.uri = NULL; | 56 | message->body.file.uri = NULL; |
57 | break; | 57 | break; |
58 | case GNUNET_MESSENGER_KIND_PRIVATE: | 58 | case GNUNET_MESSENGER_KIND_PRIVATE: |
59 | message->body.private.length = 0; | 59 | message->body.privacy.length = 0; |
60 | message->body.private.data = NULL; | 60 | message->body.privacy.data = NULL; |
61 | break; | 61 | break; |
62 | default: | 62 | default: |
63 | break; | 63 | break; |
@@ -87,11 +87,11 @@ copy_message (const struct GNUNET_MESSENGER_Message *message) | |||
87 | copy->body.file.uri = GNUNET_strdup(message->body.file.uri); | 87 | copy->body.file.uri = GNUNET_strdup(message->body.file.uri); |
88 | break; | 88 | break; |
89 | case GNUNET_MESSENGER_KIND_PRIVATE: | 89 | case GNUNET_MESSENGER_KIND_PRIVATE: |
90 | copy->body.private.data = copy->body.private.length ? GNUNET_malloc(copy->body.private.length) : NULL; | 90 | copy->body.privacy.data = copy->body.privacy.length ? GNUNET_malloc(copy->body.privacy.length) : NULL; |
91 | 91 | ||
92 | if (copy->body.private.data) | 92 | if (copy->body.privacy.data) |
93 | { | 93 | { |
94 | GNUNET_memcpy(copy->body.private.data, message->body.private.data, copy->body.private.length); | 94 | GNUNET_memcpy(copy->body.privacy.data, message->body.privacy.data, copy->body.privacy.length); |
95 | } | 95 | } |
96 | 96 | ||
97 | break; | 97 | break; |
@@ -117,7 +117,7 @@ destroy_message_body (enum GNUNET_MESSENGER_MessageKind kind, struct GNUNET_MESS | |||
117 | GNUNET_free(body->file.uri); | 117 | GNUNET_free(body->file.uri); |
118 | break; | 118 | break; |
119 | case GNUNET_MESSENGER_KIND_PRIVATE: | 119 | case GNUNET_MESSENGER_KIND_PRIVATE: |
120 | GNUNET_free(body->private.data); | 120 | GNUNET_free(body->privacy.data); |
121 | break; | 121 | break; |
122 | default: | 122 | default: |
123 | break; | 123 | break; |
@@ -206,7 +206,7 @@ get_message_body_kind_size (enum GNUNET_MESSENGER_MessageKind kind) | |||
206 | length += member_size(struct GNUNET_MESSENGER_Message, body.file.name); | 206 | length += member_size(struct GNUNET_MESSENGER_Message, body.file.name); |
207 | break; | 207 | break; |
208 | case GNUNET_MESSENGER_KIND_PRIVATE: | 208 | case GNUNET_MESSENGER_KIND_PRIVATE: |
209 | length += member_size(struct GNUNET_MESSENGER_Message, body.private.key); | 209 | length += member_size(struct GNUNET_MESSENGER_Message, body.privacy.key); |
210 | break; | 210 | break; |
211 | default: | 211 | default: |
212 | break; | 212 | break; |
@@ -256,7 +256,7 @@ get_message_body_size (enum GNUNET_MESSENGER_MessageKind kind, const struct GNUN | |||
256 | length += strlen (body->file.uri); | 256 | length += strlen (body->file.uri); |
257 | break; | 257 | break; |
258 | case GNUNET_MESSENGER_KIND_PRIVATE: | 258 | case GNUNET_MESSENGER_KIND_PRIVATE: |
259 | length += body->private.length; | 259 | length += body->privacy.length; |
260 | break; | 260 | break; |
261 | default: | 261 | default: |
262 | break; | 262 | break; |
@@ -421,8 +421,8 @@ encode_message_body (enum GNUNET_MESSENGER_MessageKind kind, const struct GNUNET | |||
421 | encode_step_ext(buffer, offset, body->file.uri, min(length - offset, strlen(body->file.uri))); | 421 | encode_step_ext(buffer, offset, body->file.uri, min(length - offset, strlen(body->file.uri))); |
422 | break; | 422 | break; |
423 | case GNUNET_MESSENGER_KIND_PRIVATE: | 423 | case GNUNET_MESSENGER_KIND_PRIVATE: |
424 | encode_step(buffer, offset, &(body->private.key)); | 424 | encode_step(buffer, offset, &(body->privacy.key)); |
425 | encode_step_ext(buffer, offset, body->private.data, min(length - offset, body->private.length)); | 425 | encode_step_ext(buffer, offset, body->privacy.data, min(length - offset, body->privacy.length)); |
426 | break; | 426 | break; |
427 | default: | 427 | default: |
428 | break; | 428 | break; |
@@ -579,10 +579,10 @@ decode_message_body (enum GNUNET_MESSENGER_MessageKind *kind, struct GNUNET_MESS | |||
579 | decode_step_malloc(buffer, offset, body->file.uri, length - offset, 1); | 579 | decode_step_malloc(buffer, offset, body->file.uri, length - offset, 1); |
580 | break; | 580 | break; |
581 | case GNUNET_MESSENGER_KIND_PRIVATE: | 581 | case GNUNET_MESSENGER_KIND_PRIVATE: |
582 | decode_step(buffer, offset, &(body->private.key)); | 582 | decode_step(buffer, offset, &(body->privacy.key)); |
583 | 583 | ||
584 | body->private.length = (length - offset); | 584 | body->privacy.length = (length - offset); |
585 | decode_step_malloc(buffer, offset, body->private.data, length - offset, 0); | 585 | decode_step_malloc(buffer, offset, body->privacy.data, length - offset, 0); |
586 | break; | 586 | break; |
587 | default: | 587 | default: |
588 | *kind = GNUNET_MESSENGER_KIND_UNKNOWN; | 588 | *kind = GNUNET_MESSENGER_KIND_UNKNOWN; |
@@ -738,14 +738,14 @@ encrypt_message (struct GNUNET_MESSENGER_Message *message, const struct GNUNET_I | |||
738 | const uint16_t padded_length = calc_padded_length(length); | 738 | const uint16_t padded_length = calc_padded_length(length); |
739 | 739 | ||
740 | message->header.kind = GNUNET_MESSENGER_KIND_PRIVATE; | 740 | message->header.kind = GNUNET_MESSENGER_KIND_PRIVATE; |
741 | message->body.private.data = GNUNET_malloc(padded_length); | 741 | message->body.privacy.data = GNUNET_malloc(padded_length); |
742 | message->body.private.length = padded_length; | 742 | message->body.privacy.length = padded_length; |
743 | 743 | ||
744 | encode_short_message (&shortened, padded_length, message->body.private.data); | 744 | encode_short_message (&shortened, padded_length, message->body.privacy.data); |
745 | 745 | ||
746 | if (padded_length == GNUNET_IDENTITY_encrypt (message->body.private.data, padded_length, key, | 746 | if (padded_length == GNUNET_IDENTITY_encrypt (message->body.privacy.data, padded_length, key, |
747 | &(message->body.private.key), | 747 | &(message->body.privacy.key), |
748 | message->body.private.data)) | 748 | message->body.privacy.data)) |
749 | { | 749 | { |
750 | destroy_message_body (shortened.kind, &(shortened.body)); | 750 | destroy_message_body (shortened.kind, &(shortened.body)); |
751 | return GNUNET_YES; | 751 | return GNUNET_YES; |
@@ -764,9 +764,9 @@ decrypt_message (struct GNUNET_MESSENGER_Message *message, const struct GNUNET_I | |||
764 | { | 764 | { |
765 | GNUNET_assert((message) && (key)); | 765 | GNUNET_assert((message) && (key)); |
766 | 766 | ||
767 | if (message->body.private.length != GNUNET_IDENTITY_decrypt (message->body.private.data, message->body.private.length, | 767 | if (message->body.privacy.length != GNUNET_IDENTITY_decrypt (message->body.privacy.data, message->body.privacy.length, |
768 | key, &(message->body.private.key), | 768 | key, &(message->body.privacy.key), |
769 | message->body.private.data)) | 769 | message->body.privacy.data)) |
770 | { | 770 | { |
771 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Decrypting message failed!\n"); | 771 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Decrypting message failed!\n"); |
772 | 772 | ||
@@ -775,7 +775,7 @@ decrypt_message (struct GNUNET_MESSENGER_Message *message, const struct GNUNET_I | |||
775 | 775 | ||
776 | struct GNUNET_MESSENGER_ShortMessage shortened; | 776 | struct GNUNET_MESSENGER_ShortMessage shortened; |
777 | 777 | ||
778 | if (GNUNET_YES != decode_short_message (&shortened, message->body.private.length, message->body.private.data)) | 778 | if (GNUNET_YES != decode_short_message (&shortened, message->body.privacy.length, message->body.privacy.data)) |
779 | { | 779 | { |
780 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Decoding decrypted message failed!\n"); | 780 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Decoding decrypted message failed!\n"); |
781 | 781 | ||