X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=user_list.c;h=3c0b4f856546a2173c77696f80e0c554a646985c;hp=e13d8bb7cc7a660fdc9b56119706d893e579b2fa;hb=732734671a6d8cc8960c3c5a67d25f85ba6d7cb4;hpb=cd8bb5a2d51179a31842a2cd7012cad28deea78d

diff --git a/user_list.c b/user_list.c
index e13d8bb7..3c0b4f85 100644
--- a/user_list.c
+++ b/user_list.c
@@ -1,16 +1,19 @@
 /*
- * 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"
@@ -53,6 +56,11 @@ static void populate_user_list(char *user_list_file)
 				para_strerror(-ret));
 			continue;
 		}
+		if (ret < CHALLENGE_SIZE + 2 * CHALLENGE_SIZE + 41) {
+			PARA_WARNING_LOG("rsa key for %s too small\n", n);
+			rsa_free(rsa);
+			continue;
+		}
 		u = para_malloc(sizeof(*u));
 		u->name = para_strdup(n);
 		u->rsa = rsa;
@@ -113,7 +121,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.