rpms
/
openssh
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bump the minimum value of SSH_USE_STRONG_RNG to 14 according to SP800-131A

This commit is contained in:
Petr Lautrbach 2013-09-10 09:50:09 +02:00
parent a19397fdd2
commit 9acec07a0f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openssh-6.2p1-entropy.patch
View File

@ -71,11 +71,11 @@ diff -up openssh-6.2p1/openbsd-compat/port-linux-prng.c.entropy openssh-6.2p1/op
+ int len; + int len;
+ char *env = getenv("SSH_USE_STRONG_RNG"); + char *env = getenv("SSH_USE_STRONG_RNG");
+ char *random = "/dev/random"; + char *random = "/dev/random";
+ size_t ienv, randlen = 6; + size_t ienv, randlen = 14;
+ +
+ if (!env || !strcmp(env, "0")) + if (!env || !strcmp(env, "0"))
+ random = "/dev/urandom"; + random = "/dev/urandom";
+ else if ((ienv = atoi(env)) > 6) + else if ((ienv = atoi(env)) > randlen)
+ randlen = ienv; + randlen = ienv;
+ +
+ errno = 0; + errno = 0;
@ -98,7 +98,7 @@ diff -up openssh-6.2p1/ssh-add.0.entropy openssh-6.2p1/ssh-add.0
+ from /dev/urandom. If the SSH_USE_STRONG_RNG environment vari- + from /dev/urandom. If the SSH_USE_STRONG_RNG environment vari-
+ able is set to value other than 0 the OpenSSL random generator is + able is set to value other than 0 the OpenSSL random generator is
+ reseeded from /dev/random. The number of bytes read is defined + reseeded from /dev/random. The number of bytes read is defined
+ by the SSH_USE_STRONG_RNG value. Minimum is 6 bytes. This set- + by the SSH_USE_STRONG_RNG value. Minimum is 14 bytes. This set-
+ ting is not recommended on the computers without the hardware + ting is not recommended on the computers without the hardware
+ random generator because insufficient entropy causes the connec- + random generator because insufficient entropy causes the connec-
+ tion to be blocked until enough entropy is available. + tion to be blocked until enough entropy is available.
@ -123,7 +123,7 @@ diff -up openssh-6.2p1/ssh-add.1.entropy openssh-6.2p1/ssh-add.1
+the OpenSSL random generator is reseeded from +the OpenSSL random generator is reseeded from
+.Cm /dev/random . +.Cm /dev/random .
+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +The number of bytes read is defined by the SSH_USE_STRONG_RNG value.
+Minimum is 6 bytes. +Minimum is 14 bytes.
+This setting is not recommended on the computers without the hardware +This setting is not recommended on the computers without the hardware
+random generator because insufficient entropy causes the connection to +random generator because insufficient entropy causes the connection to
+be blocked until enough entropy is available. +be blocked until enough entropy is available.
@ -150,7 +150,7 @@ diff -up openssh-6.2p1/ssh-agent.1.entropy openssh-6.2p1/ssh-agent.1
+the OpenSSL random generator is reseeded from +the OpenSSL random generator is reseeded from
+.Cm /dev/random . +.Cm /dev/random .
+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +The number of bytes read is defined by the SSH_USE_STRONG_RNG value.
+Minimum is 6 bytes. +Minimum is 14 bytes.
+This setting is not recommended on the computers without the hardware +This setting is not recommended on the computers without the hardware
+random generator because insufficient entropy causes the connection to +random generator because insufficient entropy causes the connection to
+be blocked until enough entropy is available. +be blocked until enough entropy is available.
@ -178,7 +178,7 @@ diff -up openssh-6.2p1/sshd.8.entropy openssh-6.2p1/sshd.8
+the OpenSSL random generator is reseeded from +the OpenSSL random generator is reseeded from
+.Cm /dev/random . +.Cm /dev/random .
+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +The number of bytes read is defined by the SSH_USE_STRONG_RNG value.
+Minimum is 6 bytes. +Minimum is 14 bytes.
+This setting is not recommended on the computers without the hardware +This setting is not recommended on the computers without the hardware
+random generator because insufficient entropy causes the connection to +random generator because insufficient entropy causes the connection to
+be blocked until enough entropy is available. +be blocked until enough entropy is available.
@ -206,7 +206,7 @@ diff -up openssh-6.2p1/ssh-keygen.1.entropy openssh-6.2p1/ssh-keygen.1
+the OpenSSL random generator is reseeded from +the OpenSSL random generator is reseeded from
+.Cm /dev/random . +.Cm /dev/random .
+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +The number of bytes read is defined by the SSH_USE_STRONG_RNG value.
+Minimum is 6 bytes. +Minimum is 14 bytes.
+This setting is not recommended on the computers without the hardware +This setting is not recommended on the computers without the hardware
+random generator because insufficient entropy causes the connection to +random generator because insufficient entropy causes the connection to
+be blocked until enough entropy is available. +be blocked until enough entropy is available.
@ -234,7 +234,7 @@ diff -up openssh-6.2p1/ssh-keysign.8.entropy openssh-6.2p1/ssh-keysign.8
+the OpenSSL random generator is reseeded from +the OpenSSL random generator is reseeded from
+.Cm /dev/random . +.Cm /dev/random .
+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +The number of bytes read is defined by the SSH_USE_STRONG_RNG value.
+Minimum is 6 bytes. +Minimum is 14 bytes.
+This setting is not recommended on the computers without the hardware +This setting is not recommended on the computers without the hardware
+random generator because insufficient entropy causes the connection to +random generator because insufficient entropy causes the connection to
+be blocked until enough entropy is available. +be blocked until enough entropy is available.
@ -261,7 +261,7 @@ diff -up openssh-6.2p1/ssh.1.entropy openssh-6.2p1/ssh.1
+the OpenSSL random generator is reseeded from +the OpenSSL random generator is reseeded from
+.Cm /dev/random . +.Cm /dev/random .
+The number of bytes read is defined by the SSH_USE_STRONG_RNG value. +The number of bytes read is defined by the SSH_USE_STRONG_RNG value.
+Minimum is 6 bytes. +Minimum is 14 bytes.
+This setting is not recommended on the computers without the hardware +This setting is not recommended on the computers without the hardware
+random generator because insufficient entropy causes the connection to +random generator because insufficient entropy causes the connection to
+be blocked until enough entropy is available. +be blocked until enough entropy is available.