X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=user_list.c;h=e48660299bd9fdff685782930ff7a876d9c061e5;hb=8127db94d1773c959f0d26026cbe74811eb94d73;hp=840802b33ba811816e3459284cd471644b134bb8;hpb=a9126f461792a84c760162ecb25100f1593d427d;p=paraslash.git

diff --git a/user_list.c b/user_list.c
index 840802b3..e4866029 100644
--- a/user_list.c
+++ b/user_list.c
@@ -1,14 +1,9 @@
-/*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file user_list.c User handling for para_server. */
 
+#include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
-#include <openssl/rc4.h>
 
 #include "para.h"
 #include "error.h"
@@ -39,9 +34,9 @@ static void populate_user_list(char *user_list_file)
 		/* keyword, name, key, perms */
 		char w[255], n[255], k[255], p[255], tmp[4][255];
 		struct user *u;
-		RSA *rsa;
+		struct asymmetric_key *pubkey;
 
-		ret = para_fgets(line, MAXLINE, file_ptr);
+		ret = para_fgets(line, sizeof(line), file_ptr);
 		if (ret <= 0)
 			break;
 		if (sscanf(line,"%200s %200s %200s %200s", w, n, k, p) < 3)
@@ -49,15 +44,27 @@ 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_rsa_key(k, &rsa, LOAD_PUBLIC_KEY);
+		ret = get_public_key(k, &pubkey);
 		if (ret < 0) {
 			PARA_NOTICE_LOG("skipping entry for user %s: %s\n", n,
 				para_strerror(-ret));
 			continue;
 		}
+		/*
+		 * In order to encrypt len := CHALLENGE_SIZE + 2 * SESSION_KEY_LEN
+		 * bytes using RSA_public_encrypt() with EME-OAEP padding mode,
+		 * RSA_size(rsa) must be greater than len + 41. So ignore keys
+		 * which are too short. For details see RSA_public_encrypt(3).
+		 */
+		if (ret <= CHALLENGE_SIZE + 2 * SESSION_KEY_LEN + 41) {
+			PARA_WARNING_LOG("public key %s too short (%d)\n",
+				k, ret);
+			free_public_key(pubkey);
+			continue;
+		}
 		u = para_malloc(sizeof(*u));
 		u->name = para_strdup(n);
-		u->rsa = rsa;
+		u->pubkey = pubkey;
 		u->perms = 0;
 		num = sscanf(p, "%200[A-Z_],%200[A-Z_],%200[A-Z_],%200[A-Z_]",
 			tmp[0], tmp[1], tmp[2], tmp[3]);
@@ -87,7 +94,7 @@ err:
 }
 
 /**
- * Initialize the list of users allowed to connect to to para_server.
+ * Initialize the list of users allowed to connect to para_server.
  *
  * \param user_list_file The file containing access information.
  *
@@ -103,7 +110,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);
-			rsa_free(u->rsa);
+			free_public_key(u->pubkey);
 			free(u);
 		}
 	} else