commit 51c9feb0d8404622db4f2bd6e489684dd6b9ad20
parent 016c03992e26690c5b321ad692351068ab2dbe83
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 23 Jan 2012 12:05:54 +0000
-minor test code cleanup
Diffstat:
4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/testcurl/https/mhds_session_info_test.c b/src/testcurl/https/mhds_session_info_test.c
@@ -138,7 +138,6 @@ test_query_session ()
/* currently skip any peer authentication */
curl_easy_setopt (c, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt (c, CURLOPT_SSL_VERIFYHOST, 0);
-
curl_easy_setopt (c, CURLOPT_FAILONERROR, 1);
// NOTE: use of CONNECTTIMEOUT without also
diff --git a/src/testcurl/https/tls_daemon_options_test.c b/src/testcurl/https/tls_daemon_options_test.c
@@ -40,9 +40,8 @@ int curl_check_version (const char *req_version, ...);
* test server refuses to negotiate connections with unsupported protocol versions
*
*/
-/* TODO rm test_fd */
-int
-test_unmatching_ssl_version (void * cls, char *cipher_suite,
+static int
+test_unmatching_ssl_version (void * cls, const char *cipher_suite,
int curl_req_ssl_version)
{
struct CBC cbc;
@@ -67,6 +66,7 @@ test_unmatching_ssl_version (void * cls, char *cipher_suite,
send_curl_req (url, &cbc, cipher_suite, curl_req_ssl_version))
{
free (cbc.buf);
+ fprintf (stderr, "cURL failed to reject request despite SSL version missmatch!\n");
return -1;
}
@@ -95,14 +95,14 @@ main (int argc, char *const *argv)
return 0;
}
- char *aes128_sha = "AES128-SHA";
- char *aes256_sha = "AES256-SHA";
+ const char *aes128_sha = "AES128-SHA";
+ const char *aes256_sha = "AES256-SHA";
if (curl_uses_nss_ssl() == 0)
{
aes128_sha = "rsa_aes_128_sha";
aes256_sha = "rsa_aes_256_sha";
}
-
+
errorCount +=
test_wrap ("TLS1.0-AES-SHA1",
@@ -113,16 +113,16 @@ main (int argc, char *const *argv)
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_HTTPS_PRIORITIES, "NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+RSA:+COMP-NULL",
MHD_OPTION_END);
+
errorCount +=
- test_wrap ("TLS1.0-AES-SHA1",
+ test_wrap ("SSL3.0-AES256-SHA1",
&test_https_transfer, NULL, daemon_flags,
- aes128_sha,
+ aes256_sha,
CURL_SSLVERSION_SSLv3,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
- MHD_OPTION_HTTPS_PRIORITIES, "NONE:+VERS-SSL3.0:+AES-128-CBC:+SHA1:+RSA:+COMP-NULL",
+ MHD_OPTION_HTTPS_PRIORITIES, "NONE:+VERS-SSL3.0:+AES-256-CBC:+SHA1:+RSA:+COMP-NULL",
MHD_OPTION_END);
-
errorCount +=
test_wrap ("SSL3.0-AES-SHA1",
&test_https_transfer, NULL, daemon_flags,
diff --git a/src/testcurl/https/tls_test_common.c b/src/testcurl/https/tls_test_common.c
@@ -206,7 +206,7 @@ http_dummy_ahc (void *cls, struct MHD_Connection *connection,
*/
/* TODO have test wrap consider a NULL cbc */
int
-send_curl_req (char *url, struct CBC * cbc, char *cipher_suite,
+send_curl_req (char *url, struct CBC * cbc, const char *cipher_suite,
int proto_version)
{
CURL *c;
@@ -289,7 +289,7 @@ gen_test_file_url (char *url, int port)
* test HTTPS file transfer
*/
int
-test_https_transfer (void *cls, char *cipher_suite, int proto_version)
+test_https_transfer (void *cls, const char *cipher_suite, int proto_version)
{
int len;
int ret = 0;
@@ -424,10 +424,10 @@ teardown_session (gnutls_session_t session,
/* TODO test_wrap: change sig to (setup_func, test, va_list test_arg) */
int
-test_wrap (char *test_name, int
- (*test_function) (void * cls, char *cipher_suite,
+test_wrap (const char *test_name, int
+ (*test_function) (void * cls, const char *cipher_suite,
int proto_version), void * cls,
- int daemon_flags, char *cipher_suite, int proto_version, ...)
+ int daemon_flags, const char *cipher_suite, int proto_version, ...)
{
int ret;
va_list arg_list;
@@ -437,6 +437,7 @@ test_wrap (char *test_name, int
if (setup_testcase (&d, daemon_flags, arg_list) != 0)
{
va_end (arg_list);
+ fprintf (stderr, "Failed to setup testcase %s\n", test_name);
return -1;
}
#if 0
diff --git a/src/testcurl/https/tls_test_common.h b/src/testcurl/https/tls_test_common.h
@@ -101,11 +101,11 @@ http_dummy_ahc (void *cls, struct MHD_Connection *connection,
int gen_test_file_url (char *url, int port);
int
-send_curl_req (char *url, struct CBC *cbc, char *cipher_suite,
+send_curl_req (char *url, struct CBC *cbc, const char *cipher_suite,
int proto_version);
int
-test_https_transfer (void *cls, char *cipher_suite, int proto_version);
+test_https_transfer (void *cls, const char *cipher_suite, int proto_version);
int
setup_testcase (struct MHD_Daemon **d, int daemon_flags, va_list arg_list);
@@ -125,8 +125,8 @@ teardown_session (gnutls_session_t session,
gnutls_certificate_credentials_t xcred);
int
-test_wrap (char *test_name, int
- (*test_function) (void * cls, char *cipher_suite,
+test_wrap (const char *test_name, int
+ (*test_function) (void * cls, const char *cipher_suite,
int proto_version), void *test_function_cls,
- int daemon_flags, char *cipher_suite, int proto_version, ...);
+ int daemon_flags, const char *cipher_suite, int proto_version, ...);
#endif /* TLS_TEST_COMMON_H_ */
