projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
signal.h: Add documentation of signal_pre_select().
[paraslash.git]
/
user_list.c
diff --git
a/user_list.c
b/user_list.c
index 525a47dfac7ce6705859836c67998cf3e9358107..9c751244339c34197d52229b75b4d55e5a58a43f 100644
(file)
--- a/
user_list.c
+++ b/
user_list.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2006
-2009 Andre Noll <maan@systemlinux.org
>
+ * Copyright (C) 2006
Andre Noll <maan@tuebingen.mpg.de
>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-8,8
+8,6
@@
#include <regex.h>
#include <sys/types.h>
#include <regex.h>
#include <sys/types.h>
-#include <dirent.h>
-#include <openssl/rc4.h>
#include "para.h"
#include "error.h"
#include "para.h"
#include "error.h"
@@
-18,7
+16,6
@@
#include "string.h"
#include "list.h"
#include "user_list.h"
#include "string.h"
#include "list.h"
#include "user_list.h"
-#include "rc4.h"
static struct list_head user_list;
static struct list_head user_list;
@@
-41,7
+38,7
@@
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;
/* 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, sizeof(line), file_ptr);
if (ret <= 0)
ret = para_fgets(line, sizeof(line), file_ptr);
if (ret <= 0)
@@
-51,27
+48,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);
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_
asymmetric_key(k, LOAD_PUBLIC_KEY, &pubkey
);
if (ret < 0) {
PARA_NOTICE_LOG("skipping entry for user %s: %s\n", n,
para_strerror(-ret));
continue;
}
/*
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 *
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).
*/
* 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",
+ if (ret <= CHALLENGE_SIZE + 2 *
SESSION
_KEY_LEN + 41) {
+ PARA_WARNING_LOG("
public
key %s too short (%d)\n",
k, ret);
k, ret);
-
rsa_free(rsa
);
+
free_asymmetric_key(pubkey
);
continue;
}
u = para_malloc(sizeof(*u));
u->name = para_strdup(n);
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]);
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]);
@@
-117,7
+114,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);
list_for_each_entry_safe(u, tmp, &user_list, node) {
list_del(&u->node);
free(u->name);
-
rsa_free(u->rsa
);
+
free_asymmetric_key(u->pubkey
);
free(u);
}
} else
free(u);
}
} else