X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=user_list.c;h=525a47dfac7ce6705859836c67998cf3e9358107;hp=e13d8bb7cc7a660fdc9b56119706d893e579b2fa;hb=96d3bb449fbff0bee733fb311c23247c32a13ca1;hpb=cd8bb5a2d51179a31842a2cd7012cad28deea78d

diff --git a/user_list.c b/user_list.c
index e13d8bb7..525a47df 100644
--- a/user_list.c
+++ b/user_list.c
@@ -1,20 +1,24 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see 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"
+#include "crypt.h"
 #include "fd.h"
 #include "string.h"
 #include "list.h"
 #include "user_list.h"
+#include "rc4.h"
 
 static struct list_head user_list;
 
@@ -39,7 +43,7 @@ static void populate_user_list(char *user_list_file)
 		struct user *u;
 		RSA *rsa;
 
-		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)
@@ -53,6 +57,18 @@ static void populate_user_list(char *user_list_file)
 				para_strerror(-ret));
 			continue;
 		}
+		/*
+		 * In order to encrypt len := CHALLENGE_SIZE + 2 * RC4_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 * RC4_KEY_LEN + 41) {
+			PARA_WARNING_LOG("rsa key %s too short (%d)\n",
+				k, ret);
+			rsa_free(rsa);
+			continue;
+		}
 		u = para_malloc(sizeof(*u));
 		u->name = para_strdup(n);
 		u->rsa = rsa;
@@ -113,7 +129,7 @@ void init_user_list(char *user_list_file)
 /**
  * Lookup a user in the user list.
  *
- * \param The name of the user.
+ * \param name The name of the user.
  *
  * \return A pointer to the corresponding user struct if the user was found, \p
  * NULL otherwise.