diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2014-03-20 11:17:40 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-06-11 23:15:48 +0200 |
| commit | e95ca7cec9c8907646a2bf87e295a638d5b518fc (patch) | |
| tree | 62a7b361221a967288d0e0e83bda9d876ed1e232 /lib/vtls | |
| parent | ceacbacd149aa64612968d41c03d0577d427f075 (diff) | |
NTLM: set a fake entropy for debug builds with CURL_ENTROPY set
Curl_rand() will return a dummy and repatable random value for this
case. Makes it possible to write test cases that verify output.
Also, fake timestamp with CURL_FORCETIME set.
Only when built debug enabled of course.
Curl_ssl_random() was not used anymore so it has been
removed. Curl_rand() is enough.
create_digest_md5_message: generate base64 instead of hex string
curl_sasl: also fix memory leaks in some OOM situations
Diffstat (limited to 'lib/vtls')
| -rw-r--r-- | lib/vtls/vtls.c | 14 | ||||
| -rw-r--r-- | lib/vtls/vtls.h | 4 |
2 files changed, 2 insertions, 16 deletions
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c index 58295a4de..6c2295a45 100644 --- a/lib/vtls/vtls.c +++ b/lib/vtls/vtls.c @@ -209,7 +209,6 @@ unsigned int Curl_rand(struct SessionHandle *data) } else randseed++; - return randseed; } #endif @@ -218,7 +217,7 @@ unsigned int Curl_rand(struct SessionHandle *data) (void)data; #else if(data) { - Curl_ssl_random(data, (unsigned char *)&r, sizeof(r)); + curlssl_random(data, (unsigned char *)&r, sizeof(r)); return r; } #endif @@ -682,17 +681,6 @@ CURLcode Curl_ssl_push_certinfo(struct SessionHandle *data, return Curl_ssl_push_certinfo_len(data, certnum, label, value, valuelen); } -/* these functions are only provided by some SSL backends */ - -#ifdef have_curlssl_random -void Curl_ssl_random(struct SessionHandle *data, - unsigned char *entropy, - size_t length) -{ - curlssl_random(data, entropy, length); -} -#endif - #ifdef have_curlssl_md5sum void Curl_ssl_md5sum(unsigned char *tmp, /* input */ size_t tmplen, diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h index 8f977a3d4..d309da6e4 100644 --- a/lib/vtls/vtls.h +++ b/lib/vtls/vtls.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -89,8 +89,6 @@ void Curl_ssl_kill_session(struct curl_ssl_session *session); void Curl_ssl_delsessionid(struct connectdata *conn, void *ssl_sessionid); /* get N random bytes into the buffer */ -void Curl_ssl_random(struct SessionHandle *data, unsigned char *buffer, - size_t length); void Curl_ssl_md5sum(unsigned char *tmp, /* input */ size_t tmplen, unsigned char *md5sum, /* output */ |