Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Step:15-SP4
openssh.17572
openssh-7.6p1-seed-prng.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File openssh-7.6p1-seed-prng.patch of Package openssh.17572
# HG changeset patch # Parent 28837d0b382f9ad27914ada00fc3ba463fd00848 # extended support for (re-)seeding the OpenSSL PRNG from /dev/random # bnc#703221, FATE#312172 Index: openssh-7.6p1/entropy.c =================================================================== --- openssh-7.6p1.orig/entropy.c 2019-03-12 14:33:58.583380926 +0100 +++ openssh-7.6p1/entropy.c 2019-03-12 14:38:31.752910584 +0100 @@ -54,6 +54,7 @@ #include "pathnames.h" #include "log.h" #include "buffer.h" +#include "openbsd-compat/port-linux.h" /* * Portable OpenSSH PRNG seeding: @@ -229,6 +230,9 @@ seed_rng(void) memset(buf, '\0', sizeof(buf)); #endif /* OPENSSL_PRNG_ONLY */ + + linux_seed(); + if (RAND_status() != 1) fatal("PRNG is not seeded"); } Index: openssh-7.6p1/openbsd-compat/Makefile.in =================================================================== --- openssh-7.6p1.orig/openbsd-compat/Makefile.in 2019-03-12 14:33:58.583380926 +0100 +++ openssh-7.6p1/openbsd-compat/Makefile.in 2019-03-12 14:38:31.752910584 +0100 @@ -20,7 +20,7 @@ OPENBSD=base64.o basename.o bcrypt_pbkdf COMPAT=arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-err.o bsd-getpagesize.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-malloc.o bsd-setres_id.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xcrypt.o kludge-fd_set.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 $< Index: openssh-7.6p1/openbsd-compat/port-linux-prng.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ openssh-7.6p1/openbsd-compat/port-linux-prng.c 2019-03-12 14:38:31.752910584 +0100 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2011 Jan F. Chadima <jchadima@redhat.com> + * (c) 2011 Petr Cerny <pcerny@suse.cz> + * + * 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 "defines.h" + +#include <errno.h> +#include <stdarg.h> +#include <string.h> +#include <stdio.h> +#include <openssl/rand.h> + +#include "log.h" +#include "port-linux.h" +#include "fips.h" + +#define RNG_BYTES_DEFAULT 6L +#define RNG_ENV_VAR "SSH_USE_STRONG_RNG" + +long rand_bytes = 0; +char *rand_file = NULL; + +static void +linux_seed_init(void) +{ + long elen = 0; + char *env = getenv(RNG_ENV_VAR); + + if (env) { + errno = 0; + elen = strtol(env, NULL, 10); + if (errno) { + elen = RNG_BYTES_DEFAULT; + debug("bogus value in the %s environment variable, " + "using %li bytes from /dev/random\n", + RNG_ENV_VAR, RNG_BYTES_DEFAULT); + } + } + + if (elen || fips_mode()) + rand_file = "/dev/random"; + else + rand_file = "/dev/urandom"; + + rand_bytes = MAX(elen, RNG_BYTES_DEFAULT); +} + +void +linux_seed(void) +{ + long len; + if (!rand_file) + linux_seed_init(); + + errno = 0; + len = RAND_load_file(rand_file, rand_bytes); + if (len != rand_bytes) { + if (errno) + fatal ("cannot read from %s, %s", rand_file, strerror(errno)); + else + fatal ("EOF reading %s", rand_file); + } +} Index: openssh-7.6p1/openbsd-compat/port-linux.h =================================================================== --- openssh-7.6p1.orig/openbsd-compat/port-linux.h 2019-03-12 14:33:58.583380926 +0100 +++ openssh-7.6p1/openbsd-compat/port-linux.h 2019-03-12 14:38:31.752910584 +0100 @@ -17,6 +17,10 @@ #ifndef _PORT_LINUX_H #define _PORT_LINUX_H +extern long rand_bytes; +extern char *rand_file; +void linux_seed(void); + #ifdef WITH_SELINUX int ssh_selinux_enabled(void); void ssh_selinux_setup_pty(char *, const char *); Index: openssh-7.6p1/ssh-add.1 =================================================================== --- openssh-7.6p1.orig/ssh-add.1 2019-03-12 14:33:58.583380926 +0100 +++ openssh-7.6p1/ssh-add.1 2019-03-12 14:38:31.752910584 +0100 @@ -172,6 +172,20 @@ 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 +environment variable is set to value other than +.Cm 0 +the OpenSSL random generator is reseeded from +.Cm /dev/random . +The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +Minimum is 6 bytes. +This setting is not recommended on the computers without the hardware +random generator because insufficient entropy causes the connection to +be blocked until enough entropy is available. .El .Sh FILES .Bl -tag -width Ds Index: openssh-7.6p1/ssh-agent.1 =================================================================== --- openssh-7.6p1.orig/ssh-agent.1 2019-03-12 14:33:58.583380926 +0100 +++ openssh-7.6p1/ssh-agent.1 2019-03-12 14:38:31.752910584 +0100 @@ -214,6 +214,23 @@ 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 +environment variable is set to value other than +.Cm 0 +the OpenSSL random generator is reseeded from +.Cm /dev/random . +The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +Minimum is 6 bytes. +This setting is not recommended on the computers without the hardware +random generator because insufficient entropy causes the connection to +be blocked until enough entropy is available. .Sh SEE ALSO .Xr ssh 1 , .Xr ssh-add 1 , Index: openssh-7.6p1/ssh-keygen.1 =================================================================== --- openssh-7.6p1.orig/ssh-keygen.1 2019-03-12 14:33:58.583380926 +0100 +++ openssh-7.6p1/ssh-keygen.1 2019-03-12 14:38:31.752910584 +0100 @@ -868,6 +868,23 @@ 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 +environment variable is set to value other than +.Cm 0 +the OpenSSL random generator is reseeded from +.Cm /dev/random . +The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +Minimum is 6 bytes. +This setting is not recommended on the computers without the hardware +random generator because insufficient entropy causes the connection to +be blocked until enough entropy is available. .Sh SEE ALSO .Xr ssh 1 , .Xr ssh-add 1 , Index: openssh-7.6p1/ssh-keysign.8 =================================================================== --- openssh-7.6p1.orig/ssh-keysign.8 2019-03-12 14:33:58.583380926 +0100 +++ openssh-7.6p1/ssh-keysign.8 2019-03-12 14:38:31.752910584 +0100 @@ -80,6 +80,23 @@ 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 +environment variable is set to value other than +.Cm 0 +the OpenSSL random generator is reseeded from +.Cm /dev/random . +The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +Minimum is 6 bytes. +This setting is not recommended on the computers without the hardware +random generator because insufficient entropy causes the connection to +be blocked until enough entropy is available. .Sh SEE ALSO .Xr ssh 1 , .Xr ssh-keygen 1 , Index: openssh-7.6p1/ssh.1 =================================================================== --- openssh-7.6p1.orig/ssh.1 2019-03-12 14:33:58.583380926 +0100 +++ openssh-7.6p1/ssh.1 2019-03-12 14:38:31.752910584 +0100 @@ -1413,6 +1413,20 @@ 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 +environment variable is set to value other than +.Cm 0 +the OpenSSL random generator is reseeded from +.Cm /dev/random . +The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +Minimum is 6 bytes. +This setting is not recommended on the computers without the hardware +random generator because insufficient entropy causes the connection to +be blocked until enough entropy is available. .Sh FILES .Bl -tag -width Ds -compact .It Pa ~/.rhosts Index: openssh-7.6p1/sshd.8 =================================================================== --- openssh-7.6p1.orig/sshd.8 2019-03-12 14:33:58.583380926 +0100 +++ openssh-7.6p1/sshd.8 2019-03-12 14:38:31.752910584 +0100 @@ -934,6 +934,23 @@ 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 +environment variable is set to value other than +.Cm 0 +the OpenSSL random generator is reseeded from +.Cm /dev/random . +The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +Minimum is 6 bytes. +This setting is not recommended on the computers without the hardware +random generator because insufficient entropy causes the connection to +be blocked until enough entropy is available. .Sh SEE ALSO .Xr scp 1 , .Xr sftp 1 , Index: openssh-7.6p1/sshd.c =================================================================== --- openssh-7.6p1.orig/sshd.c 2019-03-12 14:38:31.184907389 +0100 +++ openssh-7.6p1/sshd.c 2019-03-12 14:38:31.752910584 +0100 @@ -55,6 +55,8 @@ #endif #include "openbsd-compat/sys-tree.h" #include "openbsd-compat/sys-queue.h" +#include "openbsd-compat/port-linux.h" + #include <sys/wait.h> #include <errno.h> @@ -202,6 +204,13 @@ struct { int have_ssh2_key; } sensitive_data; +/* + * Every RESEED_AFTERth connection triggers call to linux_seed() to re-seed the + * random pool. + */ +#define RESEED_AFTER 100 +static int re_seeding_counter = RESEED_AFTER; + /* This is set to true when a signal is received. */ static volatile sig_atomic_t received_sighup = 0; static volatile sig_atomic_t received_sigterm = 0; @@ -1215,6 +1224,10 @@ server_accept_loop(int *sock_in, int *so startups++; break; } + if(!(--re_seeding_counter)) { + re_seeding_counter = RESEED_AFTER; + linux_seed(); + } /* * Got connection. Fork a child to handle it, unless
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
