[openssh-commits] [openssh] 02/02: Remove unintended changes.

git+noreply at mindrot.org git+noreply at mindrot.org
Thu Jul 14 19:23:48 AEST 2022


This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit a061792a6e8d235fc40a9b5d4c22a1762bb75a7b
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Thu Jul 14 19:20:24 2022 +1000

    Remove unintended changes.
    
    I inadvertently included a couple of local changes with the OpenSSL
    3.0.4 change.  Revert, anything that should be there will be committed
    separately.
---
 regress/keyscan.sh | 13 -------------
 sftp-server-main.c |  2 ++
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/regress/keyscan.sh b/regress/keyscan.sh
index 0b8c33aa..75a14ee0 100644
--- a/regress/keyscan.sh
+++ b/regress/keyscan.sh
@@ -23,16 +23,3 @@ for t in $SSH_KEYTYPES; do
 		fail "ssh-keyscan -t $t failed with: $r"
 	fi
 done
-
-stop_sshd
-sleep 1
-
-trace "keyscan banner length"
-banner=""
-for i in `seq 245 256`; do
-	trace "keyscan length $i"
-	banner=`perl -le "print 'A'x$i"`
-	(printf "SSH-2.0-${banner}" | ${NC} -N -l $PORT >/dev/null) &
-	${SSHKEYSCAN} -p $PORT 127.0.0.1
-	sleep 3
-done
diff --git a/sftp-server-main.c b/sftp-server-main.c
index 2c70f89b..06566d36 100644
--- a/sftp-server-main.c
+++ b/sftp-server-main.c
@@ -42,6 +42,8 @@ main(int argc, char **argv)
 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
 	sanitise_stdfd();
 
+	seed_rng();
+
 	if ((user_pw = getpwuid(getuid())) == NULL) {
 		fprintf(stderr, "No user found for uid %lu\n",
 		    (u_long)getuid());

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list