Remove seed_rng calls from scp, sftp, sftp-server.
These binaries don't use OpenSSL's random functions. The next step will be to stop linking them against libcrypto. ok djm@
This commit is contained in:
parent
d73f77b8cb
commit
1bdf86725b
2
scp.c
2
scp.c
|
@ -455,8 +455,6 @@ main(int argc, char **argv)
|
||||||
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
|
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
|
||||||
sanitise_stdfd();
|
sanitise_stdfd();
|
||||||
|
|
||||||
seed_rng();
|
|
||||||
|
|
||||||
msetlocale();
|
msetlocale();
|
||||||
|
|
||||||
/* Copy argv, because we modify it */
|
/* Copy argv, because we modify it */
|
||||||
|
|
|
@ -42,8 +42,6 @@ main(int argc, char **argv)
|
||||||
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
|
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
|
||||||
sanitise_stdfd();
|
sanitise_stdfd();
|
||||||
|
|
||||||
seed_rng();
|
|
||||||
|
|
||||||
if ((user_pw = getpwuid(getuid())) == NULL) {
|
if ((user_pw = getpwuid(getuid())) == NULL) {
|
||||||
fprintf(stderr, "No user found for uid %lu\n",
|
fprintf(stderr, "No user found for uid %lu\n",
|
||||||
(u_long)getuid());
|
(u_long)getuid());
|
||||||
|
|
2
sftp.c
2
sftp.c
|
@ -2406,8 +2406,6 @@ main(int argc, char **argv)
|
||||||
sanitise_stdfd();
|
sanitise_stdfd();
|
||||||
msetlocale();
|
msetlocale();
|
||||||
|
|
||||||
seed_rng();
|
|
||||||
|
|
||||||
__progname = ssh_get_progname(argv[0]);
|
__progname = ssh_get_progname(argv[0]);
|
||||||
memset(&args, '\0', sizeof(args));
|
memset(&args, '\0', sizeof(args));
|
||||||
args.list = NULL;
|
args.list = NULL;
|
||||||
|
|
Loading…
Reference in New Issue