aboutsummaryrefslogtreecommitdiff
path: root/src/messenger/gnunet-service-messenger_member_session.c
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2023-10-18 13:37:38 +0200
committerMartin Schanzenbach <schanzen@gnunet.org>2023-10-18 13:37:38 +0200
commit9ef4abad615bea12d13be542b8ae5fbeb2dfee32 (patch)
tree8875a687e004d331c9ea6a1d511a328c72b88113 /src/messenger/gnunet-service-messenger_member_session.c
parente95236b3ed78cd597c15f34b89385295702b627f (diff)
downloadgnunet-9ef4abad615bea12d13be542b8ae5fbeb2dfee32.tar.gz
gnunet-9ef4abad615bea12d13be542b8ae5fbeb2dfee32.zip
NEWS: Refactoring components under src/ into lib/, plugin/, cli/ and service/
This also includes a necessary API refactoring of crypto from IDENTITY to UTIL.
Diffstat (limited to 'src/messenger/gnunet-service-messenger_member_session.c')
-rw-r--r--src/messenger/gnunet-service-messenger_member_session.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/messenger/gnunet-service-messenger_member_session.c b/src/messenger/gnunet-service-messenger_member_session.c
index 519ac6f05..8ae1244c4 100644
--- a/src/messenger/gnunet-service-messenger_member_session.c
+++ b/src/messenger/gnunet-service-messenger_member_session.c
@@ -33,7 +33,7 @@
33 33
34struct GNUNET_MESSENGER_MemberSession* 34struct GNUNET_MESSENGER_MemberSession*
35create_member_session (struct GNUNET_MESSENGER_Member *member, 35create_member_session (struct GNUNET_MESSENGER_Member *member,
36 const struct GNUNET_IDENTITY_PublicKey *pubkey) 36 const struct GNUNET_CRYPTO_PublicKey *pubkey)
37{ 37{
38 if ((!member) || (!pubkey) || (!(member->store))) 38 if ((!member) || (!pubkey) || (!(member->store)))
39 return NULL; 39 return NULL;
@@ -354,7 +354,7 @@ get_member_session_id (const struct GNUNET_MESSENGER_MemberSession* session)
354 return get_member_id(session->member); 354 return get_member_id(session->member);
355} 355}
356 356
357const struct GNUNET_IDENTITY_PublicKey* 357const struct GNUNET_CRYPTO_PublicKey*
358get_member_session_public_key (const struct GNUNET_MESSENGER_MemberSession* session) 358get_member_session_public_key (const struct GNUNET_MESSENGER_MemberSession* session)
359{ 359{
360 GNUNET_assert(session); 360 GNUNET_assert(session);
@@ -536,9 +536,9 @@ load_member_session (struct GNUNET_MESSENGER_Member *member,
536 if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(cfg, "session", "key", &key_data)) 536 if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(cfg, "session", "key", &key_data))
537 goto destroy_config; 537 goto destroy_config;
538 538
539 struct GNUNET_IDENTITY_PublicKey key; 539 struct GNUNET_CRYPTO_PublicKey key;
540 540
541 enum GNUNET_GenericReturnValue key_return = GNUNET_IDENTITY_public_key_from_string(key_data, &key); 541 enum GNUNET_GenericReturnValue key_return = GNUNET_CRYPTO_public_key_from_string(key_data, &key);
542 542
543 GNUNET_free(key_data); 543 GNUNET_free(key_data);
544 544
@@ -625,9 +625,9 @@ load_member_session_next (struct GNUNET_MESSENGER_MemberSession *session,
625 if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(cfg, "session", "next_key", &key_data)) 625 if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(cfg, "session", "next_key", &key_data))
626 goto destroy_config; 626 goto destroy_config;
627 627
628 struct GNUNET_IDENTITY_PublicKey next_key; 628 struct GNUNET_CRYPTO_PublicKey next_key;
629 629
630 enum GNUNET_GenericReturnValue key_return = GNUNET_IDENTITY_public_key_from_string(key_data, &next_key); 630 enum GNUNET_GenericReturnValue key_return = GNUNET_CRYPTO_public_key_from_string(key_data, &next_key);
631 631
632 GNUNET_free(key_data); 632 GNUNET_free(key_data);
633 633
@@ -710,7 +710,7 @@ save_member_session (struct GNUNET_MESSENGER_MemberSession *session,
710 710
711 struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create (); 711 struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
712 712
713 char *key_data = GNUNET_IDENTITY_public_key_to_string(get_member_session_public_key(session)); 713 char *key_data = GNUNET_CRYPTO_public_key_to_string(get_member_session_public_key(session));
714 714
715 if (key_data) 715 if (key_data)
716 { 716 {
@@ -732,7 +732,7 @@ save_member_session (struct GNUNET_MESSENGER_MemberSession *session,
732 GNUNET_free(next_id_data); 732 GNUNET_free(next_id_data);
733 } 733 }
734 734
735 key_data = GNUNET_IDENTITY_public_key_to_string(get_member_session_public_key(session->next)); 735 key_data = GNUNET_CRYPTO_public_key_to_string(get_member_session_public_key(session->next));
736 736
737 if (key_data) 737 if (key_data)
738 { 738 {