X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=user_list.c;h=31ffe67b6e96f44aaabb2c32ac31ef4cfee2d468;hp=4696a669087b007bf9e7e43004c1b632160eee82;hb=081c8921f827c1ed482c45ba22bd8bb97db2838b;hpb=d09716570fc81b71d6ad3d5f543b5f8acf1a5e33 diff --git a/user_list.c b/user_list.c index 4696a669..31ffe67b 100644 --- a/user_list.c +++ b/user_list.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Andre Noll + * Copyright (C) 2006-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,8 +8,6 @@ #include #include -#include -#include #include "para.h" #include "error.h" @@ -18,7 +16,6 @@ #include "string.h" #include "list.h" #include "user_list.h" -#include "rc4.h" static struct list_head user_list; @@ -58,12 +55,12 @@ static void populate_user_list(char *user_list_file) continue; } /* - * In order to encrypt len := CHALLENGE_SIZE + 2 * RC4_KEY_LEN + * 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 * RC4_KEY_LEN + 41) { + 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);