philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Strengthen the algorithm that generates a random cookie for /detach.

Browse Source 
This is a backwards-compatible change, no update to the scr-bx binary
is necessary.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@358 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2013-08-17 14:51:28 +00:00
parent 5582171286
commit 641565d4eb
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2c01] [Changes 1.2c01]
* Strengthen the cookie generation algorithm for /detach. (caf)
* RANDOM_SOURCE now only affects the rand() scripting function. (caf) * RANDOM_SOURCE now only affects the rand() scripting function. (caf)
* Make RANDOM_LOCAL_PORTS actually random. (caf) * Make RANDOM_LOCAL_PORTS actually random. (caf)

17
source/commands2.c
View File

@@ -2559,13 +2559,16 @@ void kill_attached_if_needed(int type)
void make_cookie(void) void make_cookie(void)
{ {
int i, j; unsigned char rand_bytes[21];
memset(connect_cookie, 0, sizeof(connect_cookie)); int i;
for (i = 0; i < (int) (20.0 * rand()/RAND_MAX) + 5; i++) char *cookie;
{
j = (int)(95.0 * rand()/RAND_MAX); for (i = 0; i < sizeof rand_bytes; i++)
connect_cookie[i] = j + 32; rand_bytes[i] = random_number(0);
}
cookie = base64_encode(rand_bytes, sizeof rand_bytes);
strlcpy(connect_cookie, cookie, sizeof connect_cookie);
new_free(&cookie);
} }
static int create_ipc_socket(void) static int create_ipc_socket(void)