luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vtls: use consistent signature for _random() implementations

Browse Source 
This will make the upcoming multissl backend much easier to implement.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin 2017-06-22 23:48:03 +02:00 committed by Daniel Stenberg
parent 78b863de7d
commit dd02a9a341
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vtls/darwinssl.c
View File

@ -2705,8 +2705,8 @@ bool Curl_darwinssl_data_pending(const struct connectdata *conn,
return false;
}
CURLcode Curl_darwinssl_random(unsigned char *entropy,
size_t length)
CURLcode Curl_darwinssl_random(struct Curl_easy *data UNUSED_PARAM,
unsigned char *entropy, size_t length)
{
/* arc4random_buf() isn't available on cats older than Lion, so let's
do this manually for the benefit of the older cats. */

4
lib/vtls/darwinssl.h
View File

@ -42,7 +42,7 @@ int Curl_darwinssl_check_cxn(struct connectdata *conn);
bool Curl_darwinssl_data_pending(const struct connectdata *conn,
int connindex);
CURLcode Curl_darwinssl_random(unsigned char *entropy,
CURLcode Curl_darwinssl_random(struct Curl_easy *data, unsigned char *entropy,
size_t length);
void Curl_darwinssl_md5sum(unsigned char *tmp, /* input */
size_t tmplen,
@ -91,7 +91,7 @@ bool Curl_darwinssl_false_start(void);
#define curlssl_version Curl_darwinssl_version
#define curlssl_check_cxn Curl_darwinssl_check_cxn
#define curlssl_data_pending(x,y) Curl_darwinssl_data_pending(x, y)
#define curlssl_random(x,y,z) ((void)x, Curl_darwinssl_random(y,z))
#define curlssl_random(x,y,z) Curl_darwinssl_random(x, y,z)
#define curlssl_md5sum(a,b,c,d) Curl_darwinssl_md5sum(a,b,c,d)
#define curlssl_sha256sum(a,b,c,d) \
Curl_darwinssl_sha256sum((unsigned char *)a, b, c, d)

3
lib/vtls/schannel.c
View File

@ -1568,7 +1568,8 @@ size_t Curl_schannel_version(char *buffer, size_t size)
return size;
}
CURLcode Curl_schannel_random(unsigned char *entropy, size_t length)
CURLcode Curl_schannel_random(struct Curl_easy *data UNUSED_PARAM,
unsigned char *entropy, size_t length)
{
HCRYPTPROV hCryptProv = 0;

5
lib/vtls/schannel.h
View File

@ -92,7 +92,8 @@ int Curl_schannel_init(void);
void Curl_schannel_cleanup(void);
size_t Curl_schannel_version(char *buffer, size_t size);
CURLcode Curl_schannel_random(unsigned char *entropy, size_t length);
CURLcode Curl_schannel_random(struct Curl_easy *data, unsigned char *entropy,
size_t length);
/* Set the API backend definition to Schannel */
#define CURL_SSL_BACKEND CURLSSLBACKEND_SCHANNEL
@ -115,7 +116,7 @@ CURLcode Curl_schannel_random(unsigned char *entropy, size_t length);
#define curlssl_version Curl_schannel_version
#define curlssl_check_cxn(x) ((void)x, -1)
#define curlssl_data_pending Curl_schannel_data_pending
#define curlssl_random(x,y,z) ((void)x, Curl_schannel_random(y,z))
#define curlssl_random(x,y,z) Curl_schannel_random(x,y,z)
#endif /* USE_SCHANNEL */
#endif /* HEADER_CURL_SCHANNEL_H */