Let helpers in portable_io.h receive void * arguments.

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index 9c751244339c34197d52229b75b4d55e5a58a43f..23fe086f189e89b3a729aa5afe145006446371bb 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -48,7 +48,7 @@ static void populate_user_list(char *user_list_file)
                if (strcmp(w, "user"))
                        continue;
                PARA_DEBUG_LOG("found entry for user %s\n", n);
-               ret = get_asymmetric_key(k, LOAD_PUBLIC_KEY, &pubkey);
+               ret = get_public_key(k, &pubkey);
                if (ret < 0) {
                        PARA_NOTICE_LOG("skipping entry for user %s: %s\n", n,
                                para_strerror(-ret));
@@ -63,7 +63,7 @@ static void populate_user_list(char *user_list_file)
                if (ret <= CHALLENGE_SIZE + 2 * SESSION_KEY_LEN + 41) {
                        PARA_WARNING_LOG("public key %s too short (%d)\n",
                                k, ret);
-                       free_asymmetric_key(pubkey);
+                       free_public_key(pubkey);
                        continue;
                }
                u = para_malloc(sizeof(*u));
@@ -114,7 +114,7 @@ void init_user_list(char *user_list_file)
                list_for_each_entry_safe(u, tmp, &user_list, node) {
                        list_del(&u->node);
                        free(u->name);
-                       free_asymmetric_key(u->pubkey);
+                       free_public_key(u->pubkey);
                        free(u);
                }
        } else