summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-10-25 14:25:07 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-10-25 14:25:07 +0200
commit2d7123ba8c2ae1bcf81bfe99e6f8779f77550b4a (patch)
tree2f8e2b3d15b7fa75b12c1707beef1a3aba9a80b9
parent3fb796a57dce177129b6e01fa93e91fec673d39d (diff)
downloadcurl-bagder/tvtime-cleanup.tar.gz
fixup openssl tvnow renamebagder/tvtime-cleanup
-rw-r--r--lib/vtls/openssl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 96374dc10..3ed265f81 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -446,14 +446,14 @@ static CURLcode Curl_ossl_seed(struct Curl_easy *data)
size_t len = sizeof(randb);
size_t i, i_max;
for(i = 0, i_max = len / sizeof(struct curltime); i < i_max; ++i) {
- struct curltime tv = Curl_tvnow();
+ struct curltime tv = Curl_now();
Curl_wait_ms(1);
tv.tv_sec *= i + 1;
tv.tv_usec *= (unsigned int)i + 2;
- tv.tv_sec ^= ((Curl_tvnow().tv_sec + Curl_tvnow().tv_usec) *
+ tv.tv_sec ^= ((Curl_now().tv_sec + Curl_now().tv_usec) *
(i + 3)) << 8;
- tv.tv_usec ^= (unsigned int) ((Curl_tvnow().tv_sec +
- Curl_tvnow().tv_usec) *
+ tv.tv_usec ^= (unsigned int) ((Curl_now().tv_sec +
+ Curl_now().tv_usec) *
(i + 4)) << 16;
memcpy(&randb[i * sizeof(struct curltime)], &tv,
sizeof(struct curltime));