tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Move entropy.c over to mysignal()

This commit is contained in:
Damien Miller 2001-02-18 15:28:11 +11:00
parent 132a8fc4c9
commit a1072a8e37
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23,6 +23,7 @@
- (stevesk) scp.c: use mysignal() for updateprogressmeter() handler. - (stevesk) scp.c: use mysignal() for updateprogressmeter() handler.
- (djm) SA_INTERRUPT is the converse of SA_RESTART, apply it only for - (djm) SA_INTERRUPT is the converse of SA_RESTART, apply it only for
SIGALRM. SIGALRM.
- (djm) Move entropy.c over to mysignal()
20010217 20010217
- (bal) OpenBSD Sync: - (bal) OpenBSD Sync:
@ -4030,4 +4031,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.795 2001/02/18 04:18:43 djm Exp $ $Id: ChangeLog,v 1.796 2001/02/18 04:28:11 djm Exp $

17
entropy.c
View File

@ -33,12 +33,13 @@
#endif /* HAVE_FLOATINGPOINT_H */ #endif /* HAVE_FLOATINGPOINT_H */
#include "ssh.h" #include "ssh.h"
#include "misc.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "atomicio.h" #include "atomicio.h"
#include "pathnames.h" #include "pathnames.h"
#include "log.h" #include "log.h"
RCSID("$Id: entropy.c,v 1.27 2001/02/18 01:44:29 djm Exp $"); RCSID("$Id: entropy.c,v 1.28 2001/02/18 04:28:12 djm Exp $");
#ifndef offsetof #ifndef offsetof
# define offsetof(type, member) ((size_t) &((type *)0)->member) # define offsetof(type, member) ((size_t) &((type *)0)->member)
@ -72,7 +73,7 @@ int get_random_bytes(unsigned char *buf, int len)
char msg[2]; char msg[2];
struct sockaddr_un addr; struct sockaddr_un addr;
int addr_len, rval, errors; int addr_len, rval, errors;
struct sigaction nsa, osa; mysig_t old_sigpipe;
/* Sanity checks */ /* Sanity checks */
if (sizeof(EGD_SOCKET) > sizeof(addr.sun_path)) if (sizeof(EGD_SOCKET) > sizeof(addr.sun_path))
@ -85,9 +86,7 @@ int get_random_bytes(unsigned char *buf, int len)
strlcpy(addr.sun_path, EGD_SOCKET, sizeof(addr.sun_path)); strlcpy(addr.sun_path, EGD_SOCKET, sizeof(addr.sun_path));
addr_len = offsetof(struct sockaddr_un, sun_path) + sizeof(EGD_SOCKET); addr_len = offsetof(struct sockaddr_un, sun_path) + sizeof(EGD_SOCKET);
memset(&nsa, 0, sizeof(nsa)); old_sigpipe = mysignal(SIGPIPE, SIG_IGN);
nsa.sa_handler = SIG_IGN;
(void) sigaction(SIGPIPE, &nsa, &osa);
errors = rval = 0; errors = rval = 0;
reopen: reopen:
@ -131,7 +130,7 @@ reopen:
rval = 1; rval = 1;
done: done:
(void) sigaction(SIGPIPE, &osa, NULL); mysignal(SIG_PIPE, old_sigpipe);
if (fd != -1) if (fd != -1)
close(fd); close(fd);
return(rval); return(rval);
@ -790,14 +789,14 @@ prng_seed_cleanup(void *junk)
void void
seed_rng(void) seed_rng(void)
{ {
void *old_sigchld_handler; mysig_t old_sigchld_handler;
if (!prng_initialised) if (!prng_initialised)
fatal("RNG not initialised"); fatal("RNG not initialised");
/* Make sure some other sigchld handler doesn't reap our entropy */ /* Make sure some other sigchld handler doesn't reap our entropy */
/* commands */ /* commands */
old_sigchld_handler = signal(SIGCHLD, SIG_DFL); old_sigchld_handler = mysignal(SIGCHLD, SIG_DFL);
debug("Seeded RNG with %i bytes from programs", (int)stir_from_programs()); debug("Seeded RNG with %i bytes from programs", (int)stir_from_programs());
debug("Seeded RNG with %i bytes from system calls", (int)stir_from_system()); debug("Seeded RNG with %i bytes from system calls", (int)stir_from_system());
@ -805,7 +804,7 @@ seed_rng(void)
if (!RAND_status()) if (!RAND_status())
fatal("Not enough entropy in RNG"); fatal("Not enough entropy in RNG");
signal(SIGCHLD, old_sigchld_handler); mysignal(SIGCHLD, old_sigchld_handler);
if (!RAND_status()) if (!RAND_status())
fatal("Couldn't initialise builtin random number generator -- exiting."); fatal("Couldn't initialise builtin random number generator -- exiting.");