added API for random number generators, served through credential factory
ported randomizer_t to a rng_t on top of /dev/(u)random (plugin random)
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/src/libstrongswan
|
||||
|
||||
AM_CFLAGS = -rdynamic
|
||||
|
||||
plugin_LTLIBRARIES = libstrongswan-random.la
|
||||
|
||||
libstrongswan_random_la_SOURCES = random_plugin.h random_plugin.c \
|
||||
random_rng.c random_rng.h
|
||||
libstrongswan_random_la_LDFLAGS = -module
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
/*
|
||||
* Copyright (C) 2008 Martin Willi
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#include "random_plugin.h"
|
||||
|
||||
#include <library.h>
|
||||
#include "random_rng.h"
|
||||
|
||||
typedef struct private_random_plugin_t private_random_plugin_t;
|
||||
|
||||
/**
|
||||
* private data of random_plugin
|
||||
*/
|
||||
struct private_random_plugin_t {
|
||||
|
||||
/**
|
||||
* public functions
|
||||
*/
|
||||
random_plugin_t public;
|
||||
};
|
||||
|
||||
/**
|
||||
* Implementation of random_plugin_t.gmptroy
|
||||
*/
|
||||
static void destroy(private_random_plugin_t *this)
|
||||
{
|
||||
lib->crypto->remove_rng(lib->crypto,
|
||||
(rng_constructor_t)random_rng_create);
|
||||
free(this);
|
||||
}
|
||||
|
||||
/*
|
||||
* see header file
|
||||
*/
|
||||
plugin_t *plugin_create()
|
||||
{
|
||||
private_random_plugin_t *this = malloc_thing(private_random_plugin_t);
|
||||
|
||||
this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
|
||||
|
||||
lib->crypto->add_rng(lib->crypto, RNG_STRONG,
|
||||
(rng_constructor_t)random_rng_create);
|
||||
lib->crypto->add_rng(lib->crypto, RNG_REAL,
|
||||
(rng_constructor_t)random_rng_create);
|
||||
|
||||
return &this->public.plugin;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
/*
|
||||
* Copyright (C) 2008 Martin Willi
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup random_p random
|
||||
* @ingroup plugins
|
||||
*
|
||||
* @defgroup random_plugin random_plugin
|
||||
* @{ @ingroup random_p
|
||||
*/
|
||||
|
||||
#ifndef RANDOM_PLUGIN_H_
|
||||
#define RANDOM_PLUGIN_H_
|
||||
|
||||
#include <plugins/plugin.h>
|
||||
|
||||
typedef struct random_plugin_t random_plugin_t;
|
||||
|
||||
/**
|
||||
* Plugin implementing a RNG reading from /dev/[u]random.
|
||||
*/
|
||||
struct random_plugin_t {
|
||||
|
||||
/**
|
||||
* implements plugin interface
|
||||
*/
|
||||
plugin_t plugin;
|
||||
};
|
||||
|
||||
/**
|
||||
* Create a random_plugin instance.
|
||||
*/
|
||||
plugin_t *plugin_create();
|
||||
|
||||
#endif /* RANDOM_PLUGIN_H_ @}*/
|
||||
@@ -0,0 +1,134 @@
|
||||
/*
|
||||
* Copyright (C) 2005-2008 Martin Willi
|
||||
* Copyright (C) 2005 Jan Hutter
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <debug.h>
|
||||
|
||||
#include "random_rng.h"
|
||||
|
||||
#ifndef DEV_RANDOM
|
||||
# define DEV_RANDOM "/dev/random"
|
||||
#endif
|
||||
|
||||
#ifndef DEV_URANDOM
|
||||
# define DEV_URANDOM "/dev/urandom"
|
||||
#endif
|
||||
|
||||
typedef struct private_random_rng_t private_random_rng_t;
|
||||
|
||||
/**
|
||||
* Private data of an random_rng_t object.
|
||||
*/
|
||||
struct private_random_rng_t {
|
||||
|
||||
/**
|
||||
* Public random_rng_t interface.
|
||||
*/
|
||||
random_rng_t public;
|
||||
|
||||
/**
|
||||
* random device, depends on quality
|
||||
*/
|
||||
int dev;
|
||||
|
||||
/**
|
||||
* file we read random bytes from
|
||||
*/
|
||||
char *file;
|
||||
};
|
||||
|
||||
/**
|
||||
* Implementation of random_rng_t.get_bytes.
|
||||
*/
|
||||
static void get_bytes(private_random_rng_t *this, size_t bytes,
|
||||
u_int8_t *buffer)
|
||||
{
|
||||
size_t done, got;
|
||||
|
||||
done = 0;
|
||||
|
||||
while (done < bytes)
|
||||
{
|
||||
got = read(this->dev, buffer + done, bytes - done);
|
||||
if (got <= 0)
|
||||
{
|
||||
DBG1("reading from \"%s\" failed: %s, retrying...",
|
||||
this->file, strerror(errno));
|
||||
close(this->dev);
|
||||
sleep(1);
|
||||
this->dev = open(this->file, 0);
|
||||
}
|
||||
done += got;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of random_rng_t.allocate_bytes.
|
||||
*/
|
||||
static void allocate_bytes(private_random_rng_t *this, size_t bytes,
|
||||
chunk_t *chunk)
|
||||
{
|
||||
*chunk = chunk_alloc(bytes);
|
||||
get_bytes(this, chunk->len, chunk->ptr);
|
||||
}
|
||||
|
||||
/**
|
||||
* Implementation of random_rng_t.destroy.
|
||||
*/
|
||||
static void destroy(private_random_rng_t *this)
|
||||
{
|
||||
close(this->dev);
|
||||
free(this);
|
||||
}
|
||||
|
||||
/*
|
||||
* Described in header.
|
||||
*/
|
||||
random_rng_t *random_rng_create(rng_quality_t quality)
|
||||
{
|
||||
private_random_rng_t *this = malloc_thing(private_random_rng_t);
|
||||
|
||||
/* public functions */
|
||||
this->public.rng.get_bytes = (void (*) (rng_t *, size_t, u_int8_t*)) get_bytes;
|
||||
this->public.rng.allocate_bytes = (void (*) (rng_t *, size_t, chunk_t*)) allocate_bytes;
|
||||
this->public.rng.destroy = (void (*) (rng_t *))destroy;
|
||||
|
||||
if (quality == RNG_REAL)
|
||||
{
|
||||
this->file = DEV_RANDOM;
|
||||
}
|
||||
else
|
||||
{
|
||||
this->file = DEV_URANDOM;
|
||||
}
|
||||
|
||||
this->dev = open(this->file, 0);
|
||||
if (this->dev < 0)
|
||||
{
|
||||
DBG1("opening \"%s\" failed: %s", this->file, strerror(errno));
|
||||
free(this);
|
||||
return NULL;
|
||||
}
|
||||
return &this->public;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
/*
|
||||
* Copyright (C) 2008 Martin Willi
|
||||
* Hochschule fuer Technik Rapperswil
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* $Id$
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup random_rng random_rng
|
||||
* @{ @ingroup utils
|
||||
*/
|
||||
|
||||
#ifndef RANDOM_RNG_H_
|
||||
#define RANDOM_RNG_H_
|
||||
|
||||
typedef struct random_rng_t random_rng_t;
|
||||
|
||||
#include <library.h>
|
||||
|
||||
/**
|
||||
* rng_t implementation on top of /dev/[u]random
|
||||
*/
|
||||
struct random_rng_t {
|
||||
|
||||
/**
|
||||
* Implements rng_t.
|
||||
*/
|
||||
rng_t rng;
|
||||
};
|
||||
|
||||
/**
|
||||
* Creates an random_rng_t instance.
|
||||
*
|
||||
* @param quality required quality of randomness
|
||||
* @return created random_rng_t
|
||||
*/
|
||||
random_rng_t *random_rng_create(rng_quality_t quality);
|
||||
|
||||
#endif /*RANDOM_RNG_H_ @} */
|
||||
Reference in New Issue
Block a user