Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/freebl/unix_rand.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <stdio.h>
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
@@ skipping 175 matching lines @@
     RNG_RandomUpdate(&si, sizeof(si));
 
     si = sysconf(_SC_OPEN_MAX);
     RNG_RandomUpdate(&si, sizeof(si));
 }
 #endif
 
 #if defined(__sun)
 #if defined(__svr4) || defined(SVR4)
 #include <sys/systeminfo.h>
-#include <sys/times.h>
-#include <wait.h>
-
-int gettimeofday(struct timeval *);
-int gethostname(char *, int);
 
 #define getdtablesize() sysconf(_SC_OPEN_MAX)
 
 static void
 GiveSystemInfo(void)
 {
     int rv;
     char buf[2000];
 
     rv = sysinfo(SI_MACHINE, buf, sizeof(buf));
@@ skipping 145 matching lines @@
 
 static size_t
 GetHighResClock(void *buf, size_t maxbytes)
 {
     return 0;
 }
 
 static void
 GiveSystemInfo(void)
 {
+#ifndef NO_SYSINFO
     struct sysinfo si;
     if (sysinfo(&si) == 0) {
         RNG_RandomUpdate(&si, sizeof(si));
     }
+#endif
 }
 #endif /* LINUX */
 
 #if defined(NCR)
 
 #include <sys/utsname.h>
 #include <sys/systeminfo.h>
 
 #define getdtablesize() sysconf(_SC_OPEN_MAX)
 
@@ skipping 285 matching lines @@
 
 size_t RNG_GetNoise(void *buf, size_t maxbytes)
 {
     struct timeval tv;
     int n = 0;
     int c;
 
     n = GetHighResClock(buf, maxbytes);
     maxbytes -= n;
 
-#if defined(__sun) && (defined(_svr4) || defined(SVR4)) || defined(sony)
-    (void)gettimeofday(&tv);
-#else
     (void)gettimeofday(&tv, 0);
-#endif
     c = CopyLowBits((char*)buf+n, maxbytes, &tv.tv_usec, sizeof(tv.tv_usec));
     n += c;
     maxbytes -= c;
     c = CopyLowBits((char*)buf+n, maxbytes, &tv.tv_sec, sizeof(tv.tv_sec));
     n += c;
     return n;
 }
 
 #define SAFE_POPEN_MAXARGS      10      /* must be at least 2 */
 
@@ skipping 459 matching lines @@
         fileBytes += bytes;
         buffer += bytes;
     }
     fclose(file);
     if (fileBytes != maxLen) {
         PORT_SetError(SEC_ERROR_NEED_RANDOM);  /* system RNG failed */
         fileBytes = 0;
     }
     return fileBytes;
 }