diff options
Diffstat (limited to 'src/testcurl/https')
-rw-r--r-- | src/testcurl/https/test_empty_response.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_parallel.c | 3 | ||||
-rw-r--r-- | src/testcurl/https/test_https_get_parallel_threads.c | 5 | ||||
-rw-r--r-- | src/testcurl/https/test_https_session_info.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_https_time_out.c | 2 | ||||
-rw-r--r-- | src/testcurl/https/test_tls_options.c | 6 |
6 files changed, 11 insertions, 9 deletions
diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c index 2cd159f9..bf05baca 100644 --- a/src/testcurl/https/test_empty_response.c +++ b/src/testcurl/https/test_empty_response.c | |||
@@ -78,6 +78,7 @@ testInternalSelectGet () | |||
78 | time_t start; | 78 | time_t start; |
79 | struct timeval tv; | 79 | struct timeval tv; |
80 | int port; | 80 | int port; |
81 | char *aes256_sha = "AES256-SHA"; | ||
81 | 82 | ||
82 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | 83 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) |
83 | port = 0; | 84 | port = 0; |
@@ -107,7 +108,6 @@ testInternalSelectGet () | |||
107 | } | 108 | } |
108 | port = (int) dinfo->port; | 109 | port = (int) dinfo->port; |
109 | } | 110 | } |
110 | char *aes256_sha = "AES256-SHA"; | ||
111 | if (curl_uses_nss_ssl () == 0) | 111 | if (curl_uses_nss_ssl () == 0) |
112 | { | 112 | { |
113 | aes256_sha = "rsa_aes_256_sha"; | 113 | aes256_sha = "rsa_aes_256_sha"; |
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c index af5345bc..cce97fca 100644 --- a/src/testcurl/https/test_https_get_parallel.c +++ b/src/testcurl/https/test_https_get_parallel.c | |||
@@ -140,6 +140,7 @@ main (int argc, char *const *argv) | |||
140 | unsigned int errorCount = 0; | 140 | unsigned int errorCount = 0; |
141 | const char *aes256_sha = "AES256-SHA"; | 141 | const char *aes256_sha = "AES256-SHA"; |
142 | int port; | 142 | int port; |
143 | unsigned int iseed; | ||
143 | (void) argc; /* Unused. Silent compiler warning. */ | 144 | (void) argc; /* Unused. Silent compiler warning. */ |
144 | 145 | ||
145 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | 146 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) |
@@ -148,7 +149,7 @@ main (int argc, char *const *argv) | |||
148 | port = 3020; | 149 | port = 3020; |
149 | 150 | ||
150 | /* initialize random seed used by curl clients */ | 151 | /* initialize random seed used by curl clients */ |
151 | unsigned int iseed = (unsigned int) time (NULL); | 152 | iseed = (unsigned int) time (NULL); |
152 | srand (iseed); | 153 | srand (iseed); |
153 | if (! testsuite_curl_global_init ()) | 154 | if (! testsuite_curl_global_init ()) |
154 | return 99; | 155 | return 99; |
diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c index 969bd45e..4a7d1b1d 100644 --- a/src/testcurl/https/test_https_get_parallel_threads.c +++ b/src/testcurl/https/test_https_get_parallel_threads.c | |||
@@ -142,6 +142,8 @@ main (int argc, char *const *argv) | |||
142 | unsigned int errorCount = 0; | 142 | unsigned int errorCount = 0; |
143 | const char *ssl_version; | 143 | const char *ssl_version; |
144 | int port; | 144 | int port; |
145 | unsigned int iseed; | ||
146 | char *aes256_sha = "AES256-SHA"; | ||
145 | (void) argc; /* Unused. Silent compiler warning. */ | 147 | (void) argc; /* Unused. Silent compiler warning. */ |
146 | 148 | ||
147 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | 149 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) |
@@ -150,7 +152,7 @@ main (int argc, char *const *argv) | |||
150 | port = 3010; | 152 | port = 3010; |
151 | 153 | ||
152 | /* initialize random seed used by curl clients */ | 154 | /* initialize random seed used by curl clients */ |
153 | unsigned int iseed = (unsigned int) time (NULL); | 155 | iseed = (unsigned int) time (NULL); |
154 | 156 | ||
155 | #ifdef MHD_HTTPS_REQUIRE_GRYPT | 157 | #ifdef MHD_HTTPS_REQUIRE_GRYPT |
156 | #ifdef GCRYCTL_INITIALIZATION_FINISHED | 158 | #ifdef GCRYCTL_INITIALIZATION_FINISHED |
@@ -174,7 +176,6 @@ main (int argc, char *const *argv) | |||
174 | return 77; | 176 | return 77; |
175 | } | 177 | } |
176 | 178 | ||
177 | char *aes256_sha = "AES256-SHA"; | ||
178 | if (curl_uses_nss_ssl () == 0) | 179 | if (curl_uses_nss_ssl () == 0) |
179 | { | 180 | { |
180 | aes256_sha = "rsa_aes_256_sha"; | 181 | aes256_sha = "rsa_aes_256_sha"; |
diff --git a/src/testcurl/https/test_https_session_info.c b/src/testcurl/https/test_https_session_info.c index f80ea4cd..9ca97b36 100644 --- a/src/testcurl/https/test_https_session_info.c +++ b/src/testcurl/https/test_https_session_info.c | |||
@@ -103,6 +103,7 @@ test_query_session () | |||
103 | CURLcode errornum; | 103 | CURLcode errornum; |
104 | char url[256]; | 104 | char url[256]; |
105 | int port; | 105 | int port; |
106 | const char *aes256_sha = "AES256-SHA"; | ||
106 | 107 | ||
107 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | 108 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) |
108 | port = 0; | 109 | port = 0; |
@@ -142,7 +143,6 @@ test_query_session () | |||
142 | port = (int) dinfo->port; | 143 | port = (int) dinfo->port; |
143 | } | 144 | } |
144 | 145 | ||
145 | const char *aes256_sha = "AES256-SHA"; | ||
146 | if (curl_uses_nss_ssl () == 0) | 146 | if (curl_uses_nss_ssl () == 0) |
147 | { | 147 | { |
148 | aes256_sha = "rsa_aes_256_sha"; | 148 | aes256_sha = "rsa_aes_256_sha"; |
diff --git a/src/testcurl/https/test_https_time_out.c b/src/testcurl/https/test_https_time_out.c index 7721d486..ca214315 100644 --- a/src/testcurl/https/test_https_time_out.c +++ b/src/testcurl/https/test_https_time_out.c | |||
@@ -103,7 +103,7 @@ test_tls_session_time_out (gnutls_session_t session, int port) | |||
103 | int | 103 | int |
104 | main (int argc, char *const *argv) | 104 | main (int argc, char *const *argv) |
105 | { | 105 | { |
106 | int errorCount = 0;; | 106 | int errorCount = 0; |
107 | struct MHD_Daemon *d; | 107 | struct MHD_Daemon *d; |
108 | gnutls_session_t session; | 108 | gnutls_session_t session; |
109 | gnutls_datum_t key; | 109 | gnutls_datum_t key; |
diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c index f94834b5..f42e324b 100644 --- a/src/testcurl/https/test_tls_options.c +++ b/src/testcurl/https/test_tls_options.c | |||
@@ -47,6 +47,7 @@ test_unmatching_ssl_version (void *cls, int port, const char *cipher_suite, | |||
47 | int curl_req_ssl_version) | 47 | int curl_req_ssl_version) |
48 | { | 48 | { |
49 | struct CBC cbc; | 49 | struct CBC cbc; |
50 | char url[255]; | ||
50 | (void) cls; /* Unused. Silent compiler warning. */ | 51 | (void) cls; /* Unused. Silent compiler warning. */ |
51 | if (NULL == (cbc.buf = malloc (sizeof (char) * 256))) | 52 | if (NULL == (cbc.buf = malloc (sizeof (char) * 256))) |
52 | { | 53 | { |
@@ -57,7 +58,6 @@ test_unmatching_ssl_version (void *cls, int port, const char *cipher_suite, | |||
57 | cbc.size = 256; | 58 | cbc.size = 256; |
58 | cbc.pos = 0; | 59 | cbc.pos = 0; |
59 | 60 | ||
60 | char url[255]; | ||
61 | if (gen_test_file_url (url, | 61 | if (gen_test_file_url (url, |
62 | sizeof (url), | 62 | sizeof (url), |
63 | port)) | 63 | port)) |
@@ -93,6 +93,8 @@ main (int argc, char *const *argv) | |||
93 | MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD | 93 | MHD_USE_THREAD_PER_CONNECTION | MHD_USE_INTERNAL_POLLING_THREAD |
94 | | MHD_USE_TLS | MHD_USE_ERROR_LOG; | 94 | | MHD_USE_TLS | MHD_USE_ERROR_LOG; |
95 | int port; | 95 | int port; |
96 | const char *aes128_sha = "AES128-SHA"; | ||
97 | const char *aes256_sha = "AES256-SHA"; | ||
96 | (void) argc; (void) argv; /* Unused. Silent compiler warning. */ | 98 | (void) argc; (void) argv; /* Unused. Silent compiler warning. */ |
97 | 99 | ||
98 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) | 100 | if (MHD_NO != MHD_is_feature_supported (MHD_FEATURE_AUTODETECT_BIND_PORT)) |
@@ -126,8 +128,6 @@ main (int argc, char *const *argv) | |||
126 | if (! testsuite_curl_global_init ()) | 128 | if (! testsuite_curl_global_init ()) |
127 | return 99; | 129 | return 99; |
128 | 130 | ||
129 | const char *aes128_sha = "AES128-SHA"; | ||
130 | const char *aes256_sha = "AES256-SHA"; | ||
131 | if (curl_uses_nss_ssl () == 0) | 131 | if (curl_uses_nss_ssl () == 0) |
132 | { | 132 | { |
133 | aes128_sha = "rsa_aes_128_sha"; | 133 | aes128_sha = "rsa_aes_128_sha"; |