/* rndlinux.c - raw random number for OSes with /dev/random
- * Copyright (C) 1998 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
#include <config.h>
+
+#ifdef USE_RNDLINUX
+
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
-#include "types.h"
-#ifdef IS_MODULE
- #include "g10lib.h"
- #define _(a) (a)
-#else
- #include "util.h"
- #include "ttyio.h"
- #include "i18n.h"
- #include "dynload.h"
+#if 0
+ #include <sys/ioctl.h>
+ #include <asm/types.h>
+ #include <linux/random.h>
#endif
+#include "types.h"
+#include "util.h"
+#include "ttyio.h"
+#include "algorithms.h"
+
+#include "i18n.h"
static int open_device( const char *name, int minor );
-static int gather_random( byte *buffer, size_t *r_length, int level );
-#ifdef IS_MODULE
-static void tty_printf(const char *fmt, ... )
+
+#if 0
+#ifdef HAVE_DEV_RANDOM_IOCTL
+static ulong
+get_entropy_count( int fd )
{
- g10_log_info("tty_printf not available (%s)\n", fmt );
+ ulong count;
+
+ if( ioctl( fd, RNDGETENTCNT, &count ) == -1 )
+ g10_log_fatal("ioctl(RNDGETENTCNT) failed: %s\n", strerror(errno) );
+ return count;
}
#endif
-
-
+#endif
/****************
- * Used to open the Linux and xBSD /dev/random devices
+ * Used to open the /dev/random devices (Linux, xBSD, Solaris (if it exists), ...)
*/
static int
open_device( const char *name, int minor )
g10_log_fatal("can't open %s: %s\n", name, strerror(errno) );
if( fstat( fd, &sb ) )
g10_log_fatal("stat() off %s failed: %s\n", name, strerror(errno) );
- #if defined(__sparc__) && defined(__linux__)
- #warning something is wrong with UltraPenguin /dev/random
- #else
- if( !S_ISCHR(sb.st_mode) )
- g10_log_fatal("invalid random device!\n" );
- #endif
+ /* Don't check device type for better portability */
+ /* if( (!S_ISCHR(sb.st_mode)) && (!S_ISFIFO(sb.st_mode)) )
+ g10_log_fatal("invalid random device!\n" ); */
return fd;
}
-static int
-gather_random( byte *buffer, size_t *r_length, int level )
+/****************
+ * Note: Using a level of 0 should never block and better add nothing
+ * to the pool. This is easy to accomplish with /dev/urandom.
+ */
+int
+rndlinux_gather_random( void (*add)(const void*, size_t, int), int requester,
+ size_t length, int level )
{
static int fd_urandom = -1;
static int fd_random = -1;
int fd;
int n;
int warn=0;
- size_t length = *r_length;
- /* note: we will always return the requested length */
+ byte buffer[768];
if( level >= 2 ) {
if( fd_random == -1 )
fd = fd_random;
}
else {
+ /* this will also be used for elve 0 but by using /dev/urandom
+ * we can be sure that oit will never block. */
if( fd_urandom == -1 )
fd_urandom = open_device( NAME_OF_DEV_URANDOM, 9 );
fd = fd_urandom;
}
- do {
+
+ #if 0
+ #ifdef HAVE_DEV_RANDOM_IOCTL
+ g10_log_info("entropy count of %d is %lu\n", fd, get_entropy_count(fd) );
+ #endif
+ #endif
+ while( length ) {
fd_set rfds;
struct timeval tv;
int rc;
tv.tv_usec = 0;
if( !(rc=select(fd+1, &rfds, NULL, NULL, &tv)) ) {
if( !warn )
- tty_printf( _(
-"\n"
+ tty_printf(
+_("\n"
"Not enough random bytes available. Please do some other work to give\n"
-"the OS a chance to collect more entropy! (Need %d more bytes)\n"), length );
+"the OS a chance to collect more entropy! (Need %d more bytes)\n"), (int)length );
warn = 1;
continue;
}
else if( rc == -1 ) {
- tty_printf("select() error: %s\n", strerror(errno));
+ tty_printf(
+ "select() error: %s\n", strerror(errno));
continue;
}
do {
- n = read(fd, buffer, length );
- if( n >= 0 && n > length ) {
+ int nbytes = length < sizeof(buffer)? length : sizeof(buffer);
+ n = read(fd, buffer, nbytes );
+ if( n >= 0 && n > nbytes ) {
g10_log_error("bogus read from random device (n=%d)\n", n );
- n = length;
+ n = nbytes;
}
} while( n == -1 && errno == EINTR );
if( n == -1 )
g10_log_fatal("read error on random device: %s\n", strerror(errno));
- assert( n <= length );
- buffer += n;
+ (*add)( buffer, n, requester );
length -= n;
- } while( length );
-
- return 100; /* always 100% useful at the requested level */
-}
-
-
-
-#ifndef IS_MODULE
-static
-#endif
-const char * const gnupgext_version = "RNDLINUX ($Revision$)";
-
-static struct {
- int class;
- int version;
- void *func;
-} func_table[] = {
- { 40, 1, gather_random },
-};
-
-
-
-/****************
- * Enumerate the names of the functions together with informations about
- * this function. Set sequence to an integer with a initial value of 0 and
- * do not change it.
- * If what is 0 all kind of functions are returned.
- * Return values: class := class of function:
- * 10 = message digest algorithm info function
- * 11 = integer with available md algorithms
- * 20 = cipher algorithm info function
- * 21 = integer with available cipher algorithms
- * 30 = public key algorithm info function
- * 31 = integer with available pubkey algorithms
- * 40 = get gather_random function
- * 41 = get fast_random_poll function
- * version = interface version of the function/pointer
- * (currently this is 1 for all functions)
- */
-
-#ifndef IS_MODULE
-static
-#endif
-void *
-gnupgext_enum_func( int what, int *sequence, int *class, int *vers )
-{
- void *ret;
- int i = *sequence;
-
- do {
- if ( i >= DIM(func_table) || i < 0 ) {
- return NULL;
- }
- *class = func_table[i].class;
- *vers = func_table[i].version;
- ret = func_table[i].func;
- i++;
- } while ( what && what != *class );
-
- *sequence = i;
- return ret;
-}
+ }
+ memset(buffer, 0, sizeof(buffer) );
-#ifndef IS_MODULE
-void
-rndlinux_constructor(void)
-{
- register_internal_cipher_extension( gnupgext_version,
- gnupgext_enum_func );
+ return 0; /* success */
}
-#endif
+#endif /*USE_RNDLINUX*/
projects / gnupg.git / blobdiff