diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile | 4 | ||||
| -rw-r--r-- | crypto/objects/objxref.pl | 7 | ||||
| -rw-r--r-- | crypto/rand/rand_unix.c | 45 |
3 files changed, 51 insertions, 5 deletions
diff --git a/crypto/Makefile b/crypto/Makefile index b730fa45d7..c1033f6d77 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -5,9 +5,9 @@ DIR= crypto TOP= .. CC= cc -INCLUDE= -I. -I$(TOP) -I../include +INCLUDE= -I. -I$(TOP) -I../include $(ZLIB_INCLUDE) # INCLUDES targets sudbirs! -INCLUDES= -I.. -I../.. -I../asn1 -I../evp -I../../include +INCLUDES= -I.. -I../.. -I../asn1 -I../evp -I../../include $(ZLIB_INCLUDE) CFLAG= -g MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) diff --git a/crypto/objects/objxref.pl b/crypto/objects/objxref.pl index 3fa584036e..731d3ae22c 100644 --- a/crypto/objects/objxref.pl +++ b/crypto/objects/objxref.pl @@ -54,10 +54,13 @@ my @srt2 = sort return $ap2 - $bp2; } @xrkeys; - + +my $pname = $0; + +$pname =~ s|^.[^/]/||; print <<EOF; -/* AUTOGENERATED BY $0, DO NOT EDIT */ +/* AUTOGENERATED BY $pname, DO NOT EDIT */ typedef struct { diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index 550ad955f0..e9ead3a529 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -133,7 +133,50 @@ # define FD_SETSIZE (8*sizeof(fd_set)) #endif -#ifdef __OpenBSD__ +#ifdef __VOS__ +int RAND_poll(void) +{ + unsigned char buf[ENTROPY_NEEDED]; + pid_t curr_pid; + uid_t curr_uid; + static int first=1; + int i; + long rnd = 0; + struct timespec ts; + unsigned seed; + +/* The VOS random() function starts from a static seed so its + initial value is predictable. If random() returns the + initial value, reseed it with dynamic data. The VOS + real-time clock has a granularity of 1 nsec so it should be + reasonably difficult to predict its exact value. Do not + gratuitously reseed the PRNG because other code in this + process or thread may be using it. */ + + if (first) { + first = 0; + rnd = random (); + if (rnd == 1804289383) { + clock_gettime (CLOCK_REALTIME, &ts); + curr_pid = getpid(); + curr_uid = getuid(); + seed = ts.tv_sec ^ ts.tv_nsec ^ curr_pid ^ curr_uid; + srandom (seed); + } + } + + for (i = 0; i < sizeof(buf); i++) { + if (i % 4 == 0) + rnd = random(); + buf[i] = rnd; + rnd >>= 8; + } + RAND_add(buf, sizeof(buf), ENTROPY_NEEDED); + memset(buf, 0, sizeof(buf)); + + return 1; +} +#elif defined __OpenBSD__ int RAND_poll(void) { u_int32_t rnd = 0, i; |