tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 16:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Generate manpages before make install not at the end of make all

Browse Source 
- Don't seed the rng quite so often
 - Always reseed rng when requested
This commit is contained in:
Damien Miller 2000-04-04 15:04:09 +10:00
parent 9f98f06c89
commit 74a333bbe1
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -8,6 +8,9 @@
channel layer support for ssh2 channel layer support for ssh2
- [kex.h kex.c hmac.h hmac.c dsa.c dsa.h] - [kex.h kex.c hmac.h hmac.c dsa.c dsa.h]
DSA, keyexchange, algorithm agreement for ssh2 DSA, keyexchange, algorithm agreement for ssh2
- Generate manpages before make install not at the end of make all
- Don't seed the rng quite so often
- Always reseed rng when requested
20000403 20000403
- Wrote entropy collection routines for systems that lack /dev/random - Wrote entropy collection routines for systems that lack /dev/random

6
Makefile.in
View File

@ -47,7 +47,9 @@ PATHSUBS = -D/etc/ssh_config=$(sysconfdir)/ssh_config -D/etc/known_hosts=$(sysco
FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS) FIXPATHSCMD = $(PERL) $(srcdir)/fixpaths $(PATHSUBS)
all: $(TARGETS) $(MANPAGES) $(CONFIGFILES) all: $(TARGETS) $(CONFIGFILES)
manpages: $(MANPAGES)
$(LIBOBJS): config.h $(LIBOBJS): config.h
@ -95,7 +97,7 @@ catman-do:
>$${f%%.[18]}.0 ; \ >$${f%%.[18]}.0 ; \
done done
install: $(TARGETS) install: manpages $(TARGETS)
$(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(bindir)
$(INSTALL) -d $(DESTDIR)$(sbindir) $(INSTALL) -d $(DESTDIR)$(sbindir)
$(INSTALL) -d $(DESTDIR)$(mandir) $(INSTALL) -d $(DESTDIR)$(mandir)

13
entropy.c
View File

@ -41,7 +41,7 @@
# include <ssl/sha.h> # include <ssl/sha.h>
#endif #endif
RCSID("$Id: entropy.c,v 1.2 2000/04/03 05:07:32 damien Exp $"); RCSID("$Id: entropy.c,v 1.3 2000/04/04 05:04:10 damien Exp $");
#ifdef EGD_SOCKET #ifdef EGD_SOCKET
#ifndef offsetof #ifndef offsetof
@ -424,11 +424,10 @@ seed_rng(void)
void void
seed_rng(void) seed_rng(void)
{ {
if (!RAND_status()) { debug("Seeding random number generator.");
debug("Seeding random number generator."); debug("OpenSSL random status is now %i\n", RAND_status());
debug("%i bytes from system calls", (int)stir_from_system()); debug("%i bytes from system calls", (int)stir_from_system());
debug("%i bytes from programs", (int)stir_from_programs()); debug("%i bytes from programs", (int)stir_from_programs());
debug("OpenSSL random status is now %i\n", RAND_status()); debug("OpenSSL random status is now %i\n", RAND_status());
}
} }
#endif /* defined(EGD_SOCKET) || defined(RANDOM_POOL) */ #endif /* defined(EGD_SOCKET) || defined(RANDOM_POOL) */