remove unused exptab field of struct fft_complex.

[paraslash.git] / user_list.c

diff --git a/user_list.c b/user_list.c
index 63bfdfc259878402f3f70c2a5c62be5d5fa96ce9..525a47dfac7ce6705859836c67998cf3e9358107 100644 (file)
--- a/user_list.c
+++ b/user_list.c
@@ -6,15 +6,19 @@
 
 /** \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;