X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=user_list.c;h=23fe086f189e89b3a729aa5afe145006446371bb;hp=4815e5d368c28ce8f66d00d0da3af2ce6c9bc003;hb=40b1bbc50682effec5cf18b0923cfab24e154245;hpb=a731a7c6e78fb137268b42062d9fb08b4e49a2c8

diff --git a/user_list.c b/user_list.c
index 4815e5d3..23fe086f 100644
--- a/user_list.c
+++ b/user_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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