diff -up openssh-5.8p1/entropy.c.entropy openssh-5.8p1/entropy.c --- openssh-5.8p1/entropy.c.entropy 2011-01-13 11:05:29.000000000 +0100 +++ openssh-5.8p1/entropy.c 2011-04-01 10:23:58.318648953 +0200 @@ -50,6 +50,7 @@ #include "pathnames.h" #include "log.h" #include "buffer.h" +#include "openbsd-compat/port-linux.h" /* * Portable OpenSSH PRNG seeding: @@ -144,6 +145,9 @@ seed_rng(void) memset(buf, '\0', sizeof(buf)); #endif /* OPENSSL_PRNG_ONLY */ +#ifdef __linux__ + linux_seed(); +#endif /* __linux__ */ if (RAND_status() != 1) fatal("PRNG is not seeded"); } diff -up openssh-5.8p1/openbsd-compat/Makefile.in.entropy openssh-5.8p1/openbsd-compat/Makefile.in --- openssh-5.8p1/openbsd-compat/Makefile.in.entropy 2010-10-07 13:19:24.000000000 +0200 +++ openssh-5.8p1/openbsd-compat/Makefile.in 2011-04-01 10:21:38.251648364 +0200 @@ -20,7 +20,7 @@ OPENBSD=base64.o basename.o bindresvport COMPAT=bsd-arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o -PORTS=port-aix.o port-irix.o port-linux.o port-solaris.o port-tun.o port-uw.o +PORTS=port-aix.o port-irix.o port-linux.o port-linux-prng.o port-solaris.o port-tun.o port-uw.o .c.o: $(CC) $(CFLAGS) $(CPPFLAGS) -c $< diff -up openssh-5.8p1/openbsd-compat/port-linux.h.entropy openssh-5.8p1/openbsd-compat/port-linux.h --- openssh-5.8p1/openbsd-compat/port-linux.h.entropy 2011-04-01 10:22:10.165648950 +0200 +++ openssh-5.8p1/openbsd-compat/port-linux.h 2011-04-01 10:22:36.965648719 +0200 @@ -19,6 +19,8 @@ #ifndef _PORT_LINUX_H #define _PORT_LINUX_H +void linux_seed(void); + #ifdef WITH_SELINUX int ssh_selinux_enabled(void); void ssh_selinux_setup_pty(char *, const char *); diff -up openssh-5.8p1/openbsd-compat/port-linux-prng.c.entropy openssh-5.8p1/openbsd-compat/port-linux-prng.c --- openssh-5.8p1/openbsd-compat/port-linux-prng.c.entropy 2011-04-01 10:21:38.302648133 +0200 +++ openssh-5.8p1/openbsd-compat/port-linux-prng.c 2011-04-01 10:21:38.311648282 +0200 @@ -0,0 +1,56 @@ +/* $Id: port-linux.c,v 1.11.4.2 2011/02/04 00:43:08 djm Exp $ */ + +/* + * Copyright (c) 2011 Jan F. Chadima + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * Linux-specific portability code - prng support + */ + +#include "includes.h" + +#include +#include +#include +#include +#include + +#include "log.h" +#include "xmalloc.h" +#include "servconf.h" +#include "port-linux.h" +#include "key.h" +#include "hostfile.h" +#include "auth.h" + +void +linux_seed(void) +{ + int len; + char *env = getenv("SSH_USE_STRONG_RNG"); + char *random = "/dev/urandom"; + + if (env && !strcmp(env, "1")) + random = "/dev/random"; + + errno = 0; + if ((len = RAND_load_file(random, 48)) != 48) { + if (errno) + fatal ("cannot read from %s, %s", random, strerror(errno)); + else + fatal ("EOF reading %s", random); + } +} diff -up openssh-5.8p1/ssh.1.entropy openssh-5.8p1/ssh.1 --- openssh-5.8p1/ssh.1.entropy 2010-11-20 05:21:03.000000000 +0100 +++ openssh-5.8p1/ssh.1 2011-04-01 10:21:38.352648197 +0200 @@ -1250,6 +1250,17 @@ For more information, see the .Cm PermitUserEnvironment option in .Xr sshd_config 5 . +.It Ev SSH_USE_STRONG_RNG +The reseeding of the OpenSSL random generator is usually done from +.Cm /dev/urandom . +If the +.Cm SSH_USE_STRONG_RNG +is set to +.Cm 1 , +the OpenSSL random generator is reseeded from +.Cm /dev/random . +This setting is not recommended on the computers without the hardware +random generator. Insuifficient entropy causes the blocking conection. .Sh FILES .Bl -tag -width Ds -compact .It Pa ~/.rhosts diff -up openssh-5.8p1/ssh-add.1.entropy openssh-5.8p1/ssh-add.1 --- openssh-5.8p1/ssh-add.1.entropy 2010-11-05 00:20:14.000000000 +0100 +++ openssh-5.8p1/ssh-add.1 2011-04-01 10:21:38.416648713 +0200 @@ -157,6 +157,17 @@ to make this work.) Identifies the path of a .Ux Ns -domain socket used to communicate with the agent. +.It Ev SSH_USE_STRONG_RNG +The reseeding of the OpenSSL random generator is usually done from +.Cm /dev/urandom . +If the +.Cm SSH_USE_STRONG_RNG +is set to +.Cm 1 , +the OpenSSL random generator is reseeded from +.Cm /dev/random . +This setting is not recommended on the computers without the hardware +random generator. Insuifficient entropy causes the blocking conection. .El .Sh FILES .Bl -tag -width Ds diff -up openssh-5.8p1/ssh-agent.1.entropy openssh-5.8p1/ssh-agent.1 --- openssh-5.8p1/ssh-agent.1.entropy 2010-12-01 01:50:35.000000000 +0100 +++ openssh-5.8p1/ssh-agent.1 2011-04-01 10:21:38.459648714 +0200 @@ -198,6 +198,20 @@ sockets used to contain the connection t These sockets should only be readable by the owner. The sockets should get automatically removed when the agent exits. .El +.Sh ENVIRONMENT +.Bl -tag -width Ds -compact +.Pp +.It Pa SSH_USE_STRONG_RNG +The reseeding of the OpenSSL random generator is usually done from +.Cm /dev/urandom . +If the +.Cm SSH_USE_STRONG_RNG +is set to +.Cm 1 , +the OpenSSL random generator is reseeded from +.Cm /dev/random . +This setting is not recommended on the computers without the hardware +random generator. Insuifficient entropy causes the blocking conection. .Sh SEE ALSO .Xr ssh 1 , .Xr ssh-add 1 , diff -up openssh-5.8p1/sshd.8.entropy openssh-5.8p1/sshd.8 --- openssh-5.8p1/sshd.8.entropy 2010-11-05 00:20:14.000000000 +0100 +++ openssh-5.8p1/sshd.8 2011-04-01 10:21:38.505648778 +0200 @@ -937,6 +937,20 @@ concurrently for different ports, this c started last). The content of this file is not sensitive; it can be world-readable. .El +.Sh ENVIRONMENT +.Bl -tag -width Ds -compact +.Pp +.It Pa SSH_USE_STRONG_RNG +The reseeding of the OpenSSL random generator is usually done from +.Cm /dev/urandom . +If the +.Cm SSH_USE_STRONG_RNG +is set to +.Cm 1 , +the OpenSSL random generator is reseeded from +.Cm /dev/random . +This setting is not recommended on the computers without the hardware +random generator. Insuifficient entropy causes the blocking conection. .Sh SEE ALSO .Xr scp 1 , .Xr sftp 1 , diff -up openssh-5.8p1/ssh-keygen.1.entropy openssh-5.8p1/ssh-keygen.1 --- openssh-5.8p1/ssh-keygen.1.entropy 2010-11-05 00:20:14.000000000 +0100 +++ openssh-5.8p1/ssh-keygen.1 2011-04-01 10:21:38.554648691 +0200 @@ -655,6 +655,20 @@ Contains Diffie-Hellman groups used for The file format is described in .Xr moduli 5 . .El +.Sh ENVIRONMENT +.Bl -tag -width Ds -compact +.Pp +.It Pa SSH_USE_STRONG_RNG +The reseeding of the OpenSSL random generator is usually done from +.Cm /dev/urandom . +If the +.Cm SSH_USE_STRONG_RNG +is set to +.Cm 1 , +the OpenSSL random generator is reseeded from +.Cm /dev/random . +This setting is not recommended on the computers without the hardware +random generator. Insuifficient entropy causes the blocking conection. .Sh SEE ALSO .Xr ssh 1 , .Xr ssh-add 1 , diff -up openssh-5.8p1/ssh-keysign.8.entropy openssh-5.8p1/ssh-keysign.8 --- openssh-5.8p1/ssh-keysign.8.entropy 2010-08-31 14:41:14.000000000 +0200 +++ openssh-5.8p1/ssh-keysign.8 2011-04-01 10:21:38.606648660 +0200 @@ -78,6 +78,20 @@ must be set-uid root if host-based authe If these files exist they are assumed to contain public certificate information corresponding with the private keys above. .El +.Sh ENVIRONMENT +.Bl -tag -width Ds -compact +.Pp +.It Pa SSH_USE_STRONG_RNG +The reseeding of the OpenSSL random generator is usually done from +.Cm /dev/urandom . +If the +.Cm SSH_USE_STRONG_RNG +is set to +.Cm 1 , +the OpenSSL random generator is reseeded from +.Cm /dev/random . +This setting is not recommended on the computers without the hardware +random generator. Insuifficient entropy causes the blocking conection. .Sh SEE ALSO .Xr ssh 1 , .Xr ssh-keygen 1 ,