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.

diff --git a/regress/keyscan.sh b/regress/keyscan.sh
index 0b8c33aa46edb4b5f6e08a0da3cb2be31d924380..75a14ee0eecb2dca90a2fd7f72544b0a7416270d 100644 (file)
--- 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 2c70f89bc70b6f9823e4a700ee0efa2270261658..06566d36ed8400d9a13470d055afabbd5abda1a7 100644 (file)
--- 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());