oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

add EGD/PRNGD support

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19997 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-01-20 20:15:28 +00:00
parent c0b88c68eb
commit d71e77f64b
6 changed files with 283 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/des/Makefile.am
View File

@@ -101,6 +101,7 @@ libhcrypto_la_SOURCES = \
rand.c \
rand.h \
rand-fortuna.c \
rand-egd.c \
rand-unix.c \
rc2.c \
rc2.h \

228
lib/des/rand-egd.c Normal file
View File

@@ -0,0 +1,228 @@
/*
* Copyright (c) 2007 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
RCSID("$Id$");
#include <sys/types.h>
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <assert.h>
#include <rand.h>
#include <randi.h>
#include <roken.h>
static const char *egd_path = "/var/run/egd-pool";
#define MAX_EGD_DATA 255
static int
connect_egd(const char *path)
{
struct sockaddr_un addr;
int fd;
memset(&addr, 0, sizeof(addr));
if (strlen(path) > sizeof(addr.sun_path))
return -1;
addr.sun_family = AF_UNIX;
strlcpy(addr.sun_path, path, sizeof(addr.sun_path));
fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd < 0)
return -1;
if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
close(fd);
return -1;
}
return fd;
}
static int
get_entropy(int fd, void *data, size_t len)
{
unsigned char msg[2];
assert(len <= MAX_EGD_DATA);
msg[0] = 0x02; /* read blocking data */
msg[1] = len; /* wanted length */
if (net_write(fd, msg, sizeof(msg)) != sizeof(msg))
return 0;
if (net_read(fd, data, len) != len)
return 0;
return 1;
}
static int
put_entropy(int fd, const void *data, size_t len)
{
unsigned char msg[4];
assert (len <= MAX_EGD_DATA);
msg[0] = 0x03; /* write data */
msg[1] = 0; /* dummy */
msg[2] = 0; /* entropy */
msg[3] = len; /* length */
if (net_write(fd, msg, sizeof(msg)) != sizeof(msg))
return 0;
if (net_write(fd, data, len) != len)
return 0;
return 1;
}
/*
*
*/
static void
egd_seed(const void *indata, int size)
{
size_t len;
int fd, ret = 1;
fd = connect_egd(egd_path);
if (fd < 0)
return;
while(size) {
len = size;
if (len > MAX_EGD_DATA)
len = MAX_EGD_DATA;
ret = put_entropy(fd, indata, len);
if (ret != 1)
break;
indata = ((unsigned char *)indata) + len;
size -= len;
}
close(fd);
}
int
_hc_rand_egd_bytes(const char *path, unsigned char *outdata, int size)
{
size_t len;
int fd, ret = 1;
if (path == NULL)
path = egd_path;
fd = connect_egd(path);
if (fd < 0)
return 0;
while(size) {
len = size;
if (len > MAX_EGD_DATA)
len = MAX_EGD_DATA;
ret = get_entropy(fd, outdata, len);
if (ret != 1)
break;
outdata += len;
size -= len;
}
close(fd);
return ret;
}
static int
egd_bytes(unsigned char *outdata, int size)
{
return _hc_rand_egd_bytes(NULL, outdata, size);
}
static void
egd_cleanup(void)
{
}
static void
egd_add(const void *indata, int size, double entropi)
{
return egd_seed(indata, size);
}
static int
egd_pseudorand(unsigned char *outdata, int size)
{
return _hc_rand_egd_bytes(NULL, outdata, size);
}
static int
egd_status(void)
{
int fd;
fd = connect_egd(egd_path);
if (fd < 0)
return 0;
close(fd);
return 1;
}
const RAND_METHOD hc_rand_egd_method = {
egd_seed,
egd_bytes,
egd_cleanup,
egd_add,
egd_pseudorand,
egd_status
};
const RAND_METHOD *
RAND_egd_method(void)
{
return &hc_rand_egd_method;
}

21
lib/des/rand-fortuna.c
View File

@@ -436,6 +436,8 @@ static int have_entropy;
static int
fortuna_reseed(void)
{
int entropy_p = 0;
if (!init_done)
abort();
@@ -443,6 +445,7 @@ fortuna_reseed(void)
unsigned char buf[INIT_BYTES];
if (_hc_rand_unix_bytes(buf, sizeof(buf)) == 1) {
add_entropy(&main_state, buf, sizeof(buf));
entropy_p = 1;
memset(buf, 0, sizeof(buf));
}
}
@@ -454,9 +457,21 @@ fortuna_reseed(void)
for (i = 0; i < sizeof(buf)/sizeof(buf[0]); i++)
buf[i] = arc4random();
add_entropy(&main_state, (void *)buf, sizeof(buf));
entropy_p = 1;
}
#endif
/* Add EGD thingy here */
/*
* Only to get egd entropy if /dev/random or arc4rand failed since
* it can be horribly slow to generate new bits.
*/
if (!entropy_p) {
unsigned char buf[INIT_BYTES];
if (_hc_rand_egd_bytes(NULL, buf, sizeof(buf)) == 1) {
add_entropy(&main_state, buf, sizeof(buf));
entropy_p = 1;
memset(buf, 0, sizeof(buf));
}
}
{
pid_t pid = getpid();
add_entropy(&main_state, (void *)&pid, sizeof(pid));
@@ -470,7 +485,7 @@ fortuna_reseed(void)
uid_t u = getuid();
add_entropy(&main_state, (void *)&u, sizeof(u));
}
return 1;
return entropy_p;
}
static int
@@ -493,6 +508,8 @@ fortuna_seed(const void *indata, int size)
{
fortuna_init();
add_entropy(&main_state, indata, size);
if (size >= INIT_BYTES)
have_entropy = 1;
}
static int

30
lib/des/rand.c
View File

@@ -40,12 +40,13 @@ RCSID("$Id$");
#include <stdio.h>
#include <stdlib.h>
#include <rand.h>
#include <randi.h>
#include <roken.h>
extern RAND_METHOD hc_rand_fortuna_method;
extern RAND_METHOD hc_rand_unix_method;
static const RAND_METHOD *selected_meth = &hc_rand_unix_method;
static const RAND_METHOD *selected_meth = &hc_rand_fortuna_method;
void
RAND_seed(const void *indata, size_t size)
@@ -117,5 +118,32 @@ RAND_write_file(const char *filename)
int
RAND_egd(const char *filename)
{
return RAND_egd_bytes(filename, 128);
}
int
RAND_egd_bytes(const char *filename, int size)
{
void *data;
int ret;
if (size <= 0)
return 0;
data = malloc(size);
if (data == NULL)
return 0;
ret = _hc_rand_egd_bytes(filename, data, size);
if (ret != 1) {
free(data);
return ret;
}
RAND_seed(data, size);
memset(data, 0, sizeof(data));
free(data);
return 1;
}

5
lib/des/rand.h
View File

@@ -57,7 +57,10 @@ typedef struct RAND_METHOD RAND_METHOD;
#define RAND_write_file hc_RAND_write_file
#define RAND_status hc_RAND_status
#define RAND_egd hc_RAND_egd
#define RAND_egd_bytes hc_RAND_egd_bytes
#define RAND_fortuna_method hc_RAND_fortuna_method
#define RAND_egd_method hc_RAND_egd_method
#define RAND_unix_method hc_RAND_unix_method
/*
*
@@ -92,9 +95,11 @@ int RAND_load_file(const char *, size_t);
int RAND_write_file(const char *);
int RAND_status(void);
int RAND_egd(const char *);
int RAND_egd_bytes(const char *, int);
const RAND_METHOD * RAND_fortuna_method(void);
const RAND_METHOD * RAND_unix_method(void);
const RAND_METHOD * RAND_egd_method(void);
#endif /* _HEIM_RAND_H */

1
lib/des/randi.h
View File

@@ -39,5 +39,6 @@
#define _HEIM_RANDI_H 1
int _hc_rand_unix_bytes(unsigned char *, int);
int _hc_rand_egd_bytes(const char *, unsigned char *, int);
#endif /* _HEIM_RANDI_H */