summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
85d6ad3)
Some older glibc versions require the `-lrt` linker option for
resolving the reference to `clock_gettime'. Since it is not desired
to add new library dependencies in version 1.1.1, the call to
clock_gettime() is replaced by a call to gettimeofday() for the
moment. It will be added back in version 1.2.
Signed-off-by: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/5199)
size_t len;
#ifdef OPENSSL_SYS_UNIX
pid_t pid;
size_t len;
#ifdef OPENSSL_SYS_UNIX
pid_t pid;
#elif defined(OPENSSL_SYS_WIN32)
DWORD pid;
FILETIME ft;
LARGE_INTEGER pc;
#endif
#elif defined(OPENSSL_SYS_WIN32)
DWORD pid;
FILETIME ft;
LARGE_INTEGER pc;
#endif
+#ifdef OPENSSL_CPUID_OBJ
pool = RAND_POOL_new(0, 0, max_len);
if (pool == NULL)
pool = RAND_POOL_new(0, 0, max_len);
if (pool == NULL)
#endif
#ifdef OPENSSL_SYS_UNIX
#endif
#ifdef OPENSSL_SYS_UNIX
- if (tsc == 0 && clock_gettime(CLOCK_MONOTONIC, &ts) == 0)
- RAND_POOL_add(pool, (unsigned char *)&ts, sizeof(ts), 0);
- if (clock_gettime(CLOCK_REALTIME, &ts) == 0)
- RAND_POOL_add(pool, (unsigned char *)&ts, sizeof(ts), 0);
+ if (gettimeofday(&tv, NULL) == 0)
+ RAND_POOL_add(pool, (unsigned char *)&tv, sizeof(tv), 0);
#elif defined(OPENSSL_SYS_WIN32)
#elif defined(OPENSSL_SYS_WIN32)
- if (tsc == 0 && QueryPerformanceCounter(&pc) != 0)
+ if (QueryPerformanceCounter(&pc) != 0)
RAND_POOL_add(pool, (unsigned char *)&pc, sizeof(pc), 0);
GetSystemTimeAsFileTime(&ft);
RAND_POOL_add(pool, (unsigned char *)&ft, sizeof(ft), 0);
RAND_POOL_add(pool, (unsigned char *)&pc, sizeof(pc), 0);
GetSystemTimeAsFileTime(&ft);
RAND_POOL_add(pool, (unsigned char *)&ft, sizeof(ft), 0);