Commit: 7d4e4745a7dbe29f6c737ee62a36771ede20d09e - Farhan-openssh (git)

Farhan/openssh

Commit MetaInfo

• Revision: 7d4e4745a7dbe29f6c737ee62a36771ede20d09e (tree)
• Time: 2015-11-17 03:14:54
• Author: Greg Hartman <ghartman@goog...>
• Commiter: Greg Hartman

Log Message

makes certain libcrypto implementations cache a /dev/urandom fd
in preparation of sandboxing.

Upstream patch is:

https://anongit.mindrot.org/openssh.git/patch/?id=07889c75926c040b8e095949c724e66af26441cb

BUG=25695426

Change-Id: I0f746c30e31e7d938c70bcebe402f472c4649919

Change Summary

• modified: sshd.c

Incremental Difference

--- a/sshd.c
+++ b/sshd.c
@@ -623,6 +623,8 @@ privsep_preauth_child(void)
 	arc4random_buf(rnd, sizeof(rnd));
 #ifdef WITH_OPENSSL
 	RAND_seed(rnd, sizeof(rnd));
+	if ((RAND_bytes((u_char *)rnd, 1)) != 1)
+		fatal("%s: RAND_bytes failed", __func__);
 #endif
 	explicit_bzero(rnd, sizeof(rnd));
 
@@ -766,6 +768,8 @@ privsep_postauth(Authctxt *authctxt)
 	arc4random_buf(rnd, sizeof(rnd));
 #ifdef WITH_OPENSSL
 	RAND_seed(rnd, sizeof(rnd));
+	if ((RAND_bytes((u_char *)rnd, 1)) != 1)
+		fatal("%s: RAND_bytes failed", __func__);
 #endif
 	explicit_bzero(rnd, sizeof(rnd));
 
@@ -1430,6 +1434,8 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
 			arc4random_buf(rnd, sizeof(rnd));
 #ifdef WITH_OPENSSL
 			RAND_seed(rnd, sizeof(rnd));
+			if ((RAND_bytes((u_char *)rnd, 1)) != 1)
+				fatal("%s: RAND_bytes failed", __func__);
 #endif
 			explicit_bzero(rnd, sizeof(rnd));
 		}