[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 61/256: vtls: use consistent signature for _random(
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 61/256: vtls: use consistent signature for _random() implementations |
Date: |
Fri, 06 Oct 2017 19:42:32 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit dd02a9a341659ed06839a474d685b99af3a082e2
Author: Johannes Schindelin <address@hidden>
AuthorDate: Thu Jun 22 23:48:03 2017 +0200
vtls: use consistent signature for _random() implementations
This will make the upcoming multissl backend much easier to implement.
Signed-off-by: Johannes Schindelin <address@hidden>
---
lib/vtls/darwinssl.c | 4 ++--
lib/vtls/darwinssl.h | 4 ++--
lib/vtls/schannel.c | 3 ++-
lib/vtls/schannel.h | 5 +++--
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/lib/vtls/darwinssl.c b/lib/vtls/darwinssl.c
index dda53a651..883930c9d 100644
--- a/lib/vtls/darwinssl.c
+++ b/lib/vtls/darwinssl.c
@@ -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. */
diff --git a/lib/vtls/darwinssl.h b/lib/vtls/darwinssl.h
index 13e78515a..14a84fcd1 100644
--- a/lib/vtls/darwinssl.h
+++ b/lib/vtls/darwinssl.h
@@ -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)
diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c
index 94603018b..988612cd2 100644
--- a/lib/vtls/schannel.c
+++ b/lib/vtls/schannel.c
@@ -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;
diff --git a/lib/vtls/schannel.h b/lib/vtls/schannel.h
index 8627c63c9..bd12b952d 100644
--- a/lib/vtls/schannel.h
+++ b/lib/vtls/schannel.h
@@ -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 */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 53/256: imap: use defined names for response codes, (continued)
- [GNUnet-SVN] [gnurl] 53/256: imap: use defined names for response codes, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 33/256: KNOWN_BUGS: HTTP test server 'connection-monitor' problems, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 58/256: system.h: include sys/poll.h for AIX, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 48/256: config-dos: add missing defines, SIZEOF_* and two others, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 55/256: fuzz/Makefile.am: remove curlbuild.h leftovers, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 82/256: curl_ntlm_core: don't complain but #include OpenSSL header if needed, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 63/256: vtls: make sure all _data_pending() functions return bool, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 62/256: vtls: make sure all _cleanup() functions return void, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 91/256: version: if built with more than one SSL backend, report all of them, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 88/256: docs/examples: demonstrate how to select SSL backends, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 61/256: vtls: use consistent signature for _random() implementations,
gnunet <=
- [GNUnet-SVN] [gnurl] 92/256: vtls: use Curl_ssl_multi pseudo backend only when needed, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 83/256: vtls: fold the backend ID into the Curl_ssl structure, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 68/256: vtls: move md5sum into the Curl_ssl struct, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 45/256: tool_main: turn off MinGW CRT's globbing, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 25/256: system.h: remove all CURL_SIZEOF_* defines, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 96/256: asyn-thread: Improved cleanup after OOM situations, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 42/256: cmake: enable picky compiler options with clang and gcc, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 76/256: vtls: move SSL backends' private constants out of their header files, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 97/256: unit1606: Fixed shadowed variable warning, gnunet, 2017/10/06
- [GNUnet-SVN] [gnurl] 65/256: vtls: introduce a new struct for SSL backends, gnunet, 2017/10/06