aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2022-10-10 11:19:33 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2022-10-10 13:45:35 +0300
commit868cb71aa2242f35889a3b1106541b5c7bf23726 (patch)
tree3d165acd18cf72c05ad4256798d2d637c9bbf720
parentb84dc1b220b3716e329745218cdc0925b8bc8519 (diff)
downloadlibmicrohttpd-868cb71aa2242f35889a3b1106541b5c7bf23726.tar.gz
libmicrohttpd-868cb71aa2242f35889a3b1106541b5c7bf23726.zip
https tests: renamed private key variable to match certificate name
-rw-r--r--src/testcurl/https/test_empty_response.c2
-rw-r--r--src/testcurl/https/test_https_get_parallel.c8
-rw-r--r--src/testcurl/https/test_https_get_parallel_threads.c4
-rw-r--r--src/testcurl/https/test_https_get_select.c2
-rw-r--r--src/testcurl/https/test_https_multi_daemon.c4
-rw-r--r--src/testcurl/https/test_https_session_info.c42
-rw-r--r--src/testcurl/https/test_https_time_out.c2
-rw-r--r--src/testcurl/https/test_tls_options.c4
-rw-r--r--src/testcurl/https/tls_test_keys.h55
9 files changed, 60 insertions, 63 deletions
diff --git a/src/testcurl/https/test_empty_response.c b/src/testcurl/https/test_empty_response.c
index 932a51bc..0b7b7f3d 100644
--- a/src/testcurl/https/test_empty_response.c
+++ b/src/testcurl/https/test_empty_response.c
@@ -88,7 +88,7 @@ testInternalSelectGet (void)
88 d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS 88 d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS
89 | MHD_USE_INTERNAL_POLLING_THREAD, 89 | MHD_USE_INTERNAL_POLLING_THREAD,
90 port, NULL, NULL, &ahc_echo, NULL, 90 port, NULL, NULL, &ahc_echo, NULL,
91 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 91 MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
92 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 92 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
93 MHD_OPTION_END); 93 MHD_OPTION_END);
94 if (d == NULL) 94 if (d == NULL)
diff --git a/src/testcurl/https/test_https_get_parallel.c b/src/testcurl/https/test_https_get_parallel.c
index 888b2f7c..5bd1256c 100644
--- a/src/testcurl/https/test_https_get_parallel.c
+++ b/src/testcurl/https/test_https_get_parallel.c
@@ -160,7 +160,7 @@ main (int argc, char *const *argv)
160 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS 160 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
161 | MHD_USE_ERROR_LOG | MHD_USE_EPOLL, 161 | MHD_USE_ERROR_LOG | MHD_USE_EPOLL,
162 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, 162 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
163 srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, 163 srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
164 srv_self_signed_cert_pem, MHD_OPTION_END); 164 srv_self_signed_cert_pem, MHD_OPTION_END);
165#endif 165#endif
166 errorCount += 166 errorCount +=
@@ -169,7 +169,7 @@ main (int argc, char *const *argv)
169 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS 169 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
170 | MHD_USE_ERROR_LOG, 170 | MHD_USE_ERROR_LOG,
171 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, 171 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
172 srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, 172 srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
173 srv_self_signed_cert_pem, MHD_OPTION_END); 173 srv_self_signed_cert_pem, MHD_OPTION_END);
174#ifdef EPOLL_SUPPORT 174#ifdef EPOLL_SUPPORT
175 errorCount += 175 errorCount +=
@@ -178,7 +178,7 @@ main (int argc, char *const *argv)
178 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS 178 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
179 | MHD_USE_ERROR_LOG | MHD_USE_EPOLL, 179 | MHD_USE_ERROR_LOG | MHD_USE_EPOLL,
180 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, 180 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
181 srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, 181 srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
182 srv_self_signed_cert_pem, MHD_OPTION_END); 182 srv_self_signed_cert_pem, MHD_OPTION_END);
183#endif 183#endif
184 errorCount += 184 errorCount +=
@@ -187,7 +187,7 @@ main (int argc, char *const *argv)
187 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS 187 MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
188 | MHD_USE_ERROR_LOG, 188 | MHD_USE_ERROR_LOG,
189 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, 189 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
190 srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, 190 srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
191 srv_self_signed_cert_pem, MHD_OPTION_END); 191 srv_self_signed_cert_pem, MHD_OPTION_END);
192 192
193 curl_global_cleanup (); 193 curl_global_cleanup ();
diff --git a/src/testcurl/https/test_https_get_parallel_threads.c b/src/testcurl/https/test_https_get_parallel_threads.c
index c7fb1e88..14a5be4e 100644
--- a/src/testcurl/https/test_https_get_parallel_threads.c
+++ b/src/testcurl/https/test_https_get_parallel_threads.c
@@ -169,7 +169,7 @@ main (int argc, char *const *argv)
169 MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION 169 MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION
170 | MHD_USE_INTERNAL_POLLING_THREAD, 170 | MHD_USE_INTERNAL_POLLING_THREAD,
171 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, 171 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
172 srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, 172 srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
173 srv_self_signed_cert_pem, MHD_OPTION_END); 173 srv_self_signed_cert_pem, MHD_OPTION_END);
174 174
175 errorCount += 175 errorCount +=
@@ -178,7 +178,7 @@ main (int argc, char *const *argv)
178 MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION 178 MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION
179 | MHD_USE_INTERNAL_POLLING_THREAD, 179 | MHD_USE_INTERNAL_POLLING_THREAD,
180 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY, 180 NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
181 srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT, 181 srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
182 srv_self_signed_cert_pem, MHD_OPTION_END); 182 srv_self_signed_cert_pem, MHD_OPTION_END);
183 183
184 if (errorCount != 0) 184 if (errorCount != 0)
diff --git a/src/testcurl/https/test_https_get_select.c b/src/testcurl/https/test_https_get_select.c
index 9ab7e892..a1f79f77 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -105,7 +105,7 @@ testExternalGet (unsigned int flags)
105 cbc.pos = 0; 105 cbc.pos = 0;
106 d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS | flags, 106 d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS | flags,
107 port, NULL, NULL, &ahc_echo, NULL, 107 port, NULL, NULL, &ahc_echo, NULL,
108 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 108 MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
109 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 109 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
110 MHD_OPTION_END); 110 MHD_OPTION_END);
111 if (d == NULL) 111 if (d == NULL)
diff --git a/src/testcurl/https/test_https_multi_daemon.c b/src/testcurl/https/test_https_multi_daemon.c
index 7d99940c..050c9e19 100644
--- a/src/testcurl/https/test_https_multi_daemon.c
+++ b/src/testcurl/https/test_https_multi_daemon.c
@@ -63,7 +63,7 @@ test_concurent_daemon_pair (void *cls,
63 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS 63 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
64 | MHD_USE_ERROR_LOG, port1, 64 | MHD_USE_ERROR_LOG, port1,
65 NULL, NULL, &http_ahc, NULL, 65 NULL, NULL, &http_ahc, NULL,
66 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 66 MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
67 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 67 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
68 MHD_OPTION_END); 68 MHD_OPTION_END);
69 69
@@ -89,7 +89,7 @@ test_concurent_daemon_pair (void *cls,
89 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS 89 | MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
90 | MHD_USE_ERROR_LOG, port2, 90 | MHD_USE_ERROR_LOG, port2,
91 NULL, NULL, &http_ahc, NULL, 91 NULL, NULL, &http_ahc, NULL,
92 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 92 MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
93 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 93 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
94 MHD_OPTION_END); 94 MHD_OPTION_END);
95 95
diff --git a/src/testcurl/https/test_https_session_info.c b/src/testcurl/https/test_https_session_info.c
index c5c38742..040b4458 100644
--- a/src/testcurl/https/test_https_session_info.c
+++ b/src/testcurl/https/test_https_session_info.c
@@ -35,8 +35,6 @@
35#include "tls_test_common.h" 35#include "tls_test_common.h"
36#include "tls_test_keys.h" 36#include "tls_test_keys.h"
37 37
38static struct MHD_Daemon *d;
39
40/* 38/*
41 * HTTP access handler call back 39 * HTTP access handler call back
42 * used to query negotiated security parameters 40 * used to query negotiated security parameters
@@ -101,6 +99,7 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
101 CURLcode errornum; 99 CURLcode errornum;
102 char url[256]; 100 char url[256];
103 enum know_gnutls_tls_id found_tls_ver; 101 enum know_gnutls_tls_id found_tls_ver;
102 struct MHD_Daemon *d;
104 103
105 if (NULL == (cbc.buf = malloc (sizeof (char) * 255))) 104 if (NULL == (cbc.buf = malloc (sizeof (char) * 255)))
106 return 99; 105 return 99;
@@ -115,15 +114,13 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
115 NULL, NULL, 114 NULL, NULL,
116 &query_info_ahc, &found_tls_ver, 115 &query_info_ahc, &found_tls_ver,
117 MHD_OPTION_HTTPS_PRIORITIES, priorities_map[tls_ver], 116 MHD_OPTION_HTTPS_PRIORITIES, priorities_map[tls_ver],
118 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 117 MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
119 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 118 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
120 MHD_OPTION_END); 119 MHD_OPTION_END);
121 120
122 if (d == NULL) 121 if (d == NULL)
123 { 122 {
124 free (cbc.buf); 123 free (cbc.buf);
125 fflush (stderr);
126 fflush (stdout);
127 fprintf (stderr, "MHD_start_daemon() with %s failed.\n", 124 fprintf (stderr, "MHD_start_daemon() with %s failed.\n",
128 tls_names[tls_ver]); 125 tls_names[tls_ver]);
129 fflush (stderr); 126 fflush (stderr);
@@ -136,11 +133,9 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
136 if ((NULL == dinfo) || (0 == dinfo->port) ) 133 if ((NULL == dinfo) || (0 == dinfo->port) )
137 { 134 {
138 MHD_stop_daemon (d); 135 MHD_stop_daemon (d);
139 fflush (stderr); 136 free (cbc.buf);
140 fflush (stdout);
141 fprintf (stderr, "MHD_get_daemon_info() failed.\n"); 137 fprintf (stderr, "MHD_get_daemon_info() failed.\n");
142 fflush (stderr); 138 fflush (stderr);
143 free (cbc.buf);
144 return 10; 139 return 10;
145 } 140 }
146 *pport = dinfo->port; /* Use the same port for rest of the checks */ 141 *pport = dinfo->port; /* Use the same port for rest of the checks */
@@ -150,6 +145,15 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
150 sizeof (url), 145 sizeof (url),
151 *pport); 146 *pport);
152 c = curl_easy_init (); 147 c = curl_easy_init ();
148 fflush (stderr);
149 if (NULL == c)
150 {
151 fprintf (stderr, "curl_easy_init() failed.\n");
152 fflush (stderr);
153 MHD_stop_daemon (d);
154 free (cbc.buf);
155 return 99;
156 }
153#ifdef _DEBUG 157#ifdef _DEBUG
154 curl_easy_setopt (c, CURLOPT_VERBOSE, 1L); 158 curl_easy_setopt (c, CURLOPT_VERBOSE, 1L);
155#endif 159#endif
@@ -174,6 +178,9 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
174 (errornum = curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L))) || 178 (errornum = curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L))) ||
175 (CURLE_OK != (errornum = curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1L)))) 179 (CURLE_OK != (errornum = curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1L))))
176 { 180 {
181 curl_easy_cleanup (c);
182 free (cbc.buf);
183 MHD_stop_daemon (d);
177 fflush (stderr); 184 fflush (stderr);
178 fflush (stdout); 185 fflush (stdout);
179 fprintf (stderr, "Error setting libcurl option: %s.\n", 186 fprintf (stderr, "Error setting libcurl option: %s.\n",
@@ -185,9 +192,9 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
185 if (CURLE_OK != (errornum = curl_easy_perform (c))) 192 if (CURLE_OK != (errornum = curl_easy_perform (c)))
186 { 193 {
187 unsigned int ret; 194 unsigned int ret;
188 MHD_stop_daemon (d);
189 curl_easy_cleanup (c); 195 curl_easy_cleanup (c);
190 free (cbc.buf); 196 free (cbc.buf);
197 MHD_stop_daemon (d);
191 198
192 fflush (stderr); 199 fflush (stderr);
193 fflush (stdout); 200 fflush (stdout);
@@ -211,8 +218,8 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
211 } 218 }
212 219
213 curl_easy_cleanup (c); 220 curl_easy_cleanup (c);
214 MHD_stop_daemon (d);
215 free (cbc.buf); 221 free (cbc.buf);
222 MHD_stop_daemon (d);
216 223
217 if (tls_ver != found_tls_ver) 224 if (tls_ver != found_tls_ver)
218 { 225 {
@@ -250,10 +257,7 @@ test_all_supported_versions (void)
250 vers_list = gnutls_protocol_list (); 257 vers_list = gnutls_protocol_list ();
251 if (NULL == vers_list) 258 if (NULL == vers_list)
252 { 259 {
253 fflush (stderr);
254 fflush (stdout);
255 fprintf (stderr, "Error getting GnuTLS supported TLS versions"); 260 fprintf (stderr, "Error getting GnuTLS supported TLS versions");
256 fflush (stdout);
257 return 99; 261 return 99;
258 } 262 }
259 num_success = 0; 263 num_success = 0;
@@ -271,28 +275,25 @@ test_all_supported_versions (void)
271 } 275 }
272 if (0 == *ver_ptr) 276 if (0 == *ver_ptr)
273 { 277 {
274 fflush (stderr);
275 printf ("%s is not supported by GnuTLS, skipping.\n\n", 278 printf ("%s is not supported by GnuTLS, skipping.\n\n",
276 tls_names[ver_for_test]); 279 tls_names[ver_for_test]);
277 fflush (stdout); 280 fflush (stdout);
278 continue; 281 continue;
279 } 282 }
280 fflush (stderr);
281 printf ("Starting check for %s...\n", 283 printf ("Starting check for %s...\n",
282 tls_names[ver_for_test]); 284 tls_names[ver_for_test]);
283 fflush (stdout); 285 fflush (stdout);
284 res = test_query_session (ver_for_test, &port); 286 res = test_query_session (ver_for_test, &port);
287 fflush (stderr);
288 fflush (stdout);
285 if (99 == res) 289 if (99 == res)
286 { 290 {
287 fflush (stderr);
288 fflush (stdout);
289 fprintf (stderr, "Hard error. Test stopped.\n"); 291 fprintf (stderr, "Hard error. Test stopped.\n");
290 fflush (stderr); 292 fflush (stderr);
291 return 99; 293 return 99;
292 } 294 }
293 else if (77 == res) 295 else if (77 == res)
294 { 296 {
295 fflush (stderr);
296 printf ("%s does not work with libcurl client and GnuTLS " 297 printf ("%s does not work with libcurl client and GnuTLS "
297 "server combination, skipping.\n", 298 "server combination, skipping.\n",
298 tls_names[ver_for_test]); 299 tls_names[ver_for_test]);
@@ -300,8 +301,6 @@ test_all_supported_versions (void)
300 } 301 }
301 else if (0 != res) 302 else if (0 != res)
302 { 303 {
303 fflush (stderr);
304 fflush (stdout);
305 fprintf (stderr, "Check failed for %s.\n", 304 fprintf (stderr, "Check failed for %s.\n",
306 tls_names[ver_for_test]); 305 tls_names[ver_for_test]);
307 fflush (stderr); 306 fflush (stderr);
@@ -309,7 +308,6 @@ test_all_supported_versions (void)
309 } 308 }
310 else 309 else
311 { 310 {
312 fflush (stderr);
313 printf ("Check succeeded for %s.\n", 311 printf ("Check succeeded for %s.\n",
314 tls_names[ver_for_test]); 312 tls_names[ver_for_test]);
315 fflush (stdout); 313 fflush (stdout);
@@ -323,8 +321,6 @@ test_all_supported_versions (void)
323 { 321 {
324 if (0 == num_success) 322 if (0 == num_success)
325 { 323 {
326 fflush (stderr);
327 fflush (stdout);
328 fprintf (stderr, "No supported TLS version was found.\n"); 324 fprintf (stderr, "No supported TLS version was found.\n");
329 fflush (stderr); 325 fflush (stderr);
330 return 77; 326 return 77;
diff --git a/src/testcurl/https/test_https_time_out.c b/src/testcurl/https/test_https_time_out.c
index 8893c16b..9818417a 100644
--- a/src/testcurl/https/test_https_time_out.c
+++ b/src/testcurl/https/test_https_time_out.c
@@ -241,7 +241,7 @@ main (int argc, char *const *argv)
241 MHD_OPTION_CONNECTION_TIMEOUT, 241 MHD_OPTION_CONNECTION_TIMEOUT,
242 (unsigned int) timeout_val, 242 (unsigned int) timeout_val,
243 MHD_OPTION_NOTIFY_CONNECTION, &socket_cb, NULL, 243 MHD_OPTION_NOTIFY_CONNECTION, &socket_cb, NULL,
244 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 244 MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
245 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 245 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
246 MHD_OPTION_END); 246 MHD_OPTION_END);
247 247
diff --git a/src/testcurl/https/test_tls_options.c b/src/testcurl/https/test_tls_options.c
index 196aebf5..0f4a5cce 100644
--- a/src/testcurl/https/test_tls_options.c
+++ b/src/testcurl/https/test_tls_options.c
@@ -99,7 +99,7 @@ check_tls_match_inner (enum know_gnutls_tls_id tls_ver_mhd,
99 NULL, NULL, 99 NULL, NULL,
100 &simple_ahc, NULL, 100 &simple_ahc, NULL,
101 MHD_OPTION_HTTPS_PRIORITIES, priorities_map[tls_ver_mhd], 101 MHD_OPTION_HTTPS_PRIORITIES, priorities_map[tls_ver_mhd],
102 MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem, 102 MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
103 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem, 103 MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
104 MHD_OPTION_END); 104 MHD_OPTION_END);
105 fflush (stderr); 105 fflush (stderr);
@@ -415,7 +415,7 @@ test_first_supported_versions (void)
415 } 415 }
416 } 416 }
417 417
418 fprintf (stderr, "The test skipped: No know TLS version is supported by " 418 fprintf (stderr, "The test skipped: No know TLS versions are supported by "
419 "both MHD and libcurl.\n"); 419 "both MHD and libcurl.\n");
420 fflush (stderr); 420 fflush (stderr);
421 return 77; 421 return 77;
diff --git a/src/testcurl/https/tls_test_keys.h b/src/testcurl/https/tls_test_keys.h
index 53e2151d..aaea9e8b 100644
--- a/src/testcurl/https/tls_test_keys.h
+++ b/src/testcurl/https/tls_test_keys.h
@@ -147,32 +147,33 @@ static const char srv_self_signed_cert_pem[] = "-----BEGIN CERTIFICATE-----\n"
147 "-----END CERTIFICATE-----\n"; 147 "-----END CERTIFICATE-----\n";
148 148
149/* test server key */ 149/* test server key */
150static const char srv_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n" 150static const char srv_self_signed_key_pem[] =
151 "MIIEpAIBAAKCAQEAtDEagv3p9OUhUL55jMucxjNK9N5cuozhcnrwDfBSU6oVrqm5\n" 151 "-----BEGIN RSA PRIVATE KEY-----\n"
152 "kPqO1I7Cggzw68Y5jhTcBi4FXmYOZppm1R3MhSJ5JSi/67Q7X4J5rnJLXYGN27qj\n" 152 "MIIEpAIBAAKCAQEAtDEagv3p9OUhUL55jMucxjNK9N5cuozhcnrwDfBSU6oVrqm5\n"
153 "MpnoGQ/2xmsNG/isi+h/2vbtPU+WP9SEJnTfPLLpZ7KqCAk7FUUzKsuLx3/SOKtd\n" 153 "kPqO1I7Cggzw68Y5jhTcBi4FXmYOZppm1R3MhSJ5JSi/67Q7X4J5rnJLXYGN27qj\n"
154 "krWxPKwYTgnDEN6DJL7tEzCnG5DFc4mQ7YW9PaRdC3rS1T8PvQ3jB2BUnohM0cFv\n" 154 "MpnoGQ/2xmsNG/isi+h/2vbtPU+WP9SEJnTfPLLpZ7KqCAk7FUUzKsuLx3/SOKtd\n"
155 "KRuiU35tU7h7CPbL4L66VglXoiwqmgcrwI2U968bD0+wRQ5c5bzNoshJOzN6CTMh\n" 155 "krWxPKwYTgnDEN6DJL7tEzCnG5DFc4mQ7YW9PaRdC3rS1T8PvQ3jB2BUnohM0cFv\n"
156 "1IhbklSh/Z6FA/e8hj0yVo2tdllXuJGVs3PIEwIDAQABAoIBAAEtcg+LFLGtoxjq\n" 156 "KRuiU35tU7h7CPbL4L66VglXoiwqmgcrwI2U968bD0+wRQ5c5bzNoshJOzN6CTMh\n"
157 "b+tFttBJfbRcfdG6ocYqBGmUXF+MgFs573DHX3sHNOQxlaNHtSgIclF1eYgNZFFt\n" 157 "1IhbklSh/Z6FA/e8hj0yVo2tdllXuJGVs3PIEwIDAQABAoIBAAEtcg+LFLGtoxjq\n"
158 "VLIoBFTzfEQXoFosPUDoEuqVMeXLttmD7P2jwL780XJLZ4Xj6GY07npq1iGBcEZf\n" 158 "b+tFttBJfbRcfdG6ocYqBGmUXF+MgFs573DHX3sHNOQxlaNHtSgIclF1eYgNZFFt\n"
159 "yCcdoyGkr9jgc5Auyis8DStGg/jfUBC4NBvF0GnuuNPAdYRPKUpKw9EatI+FdMjy\n" 159 "VLIoBFTzfEQXoFosPUDoEuqVMeXLttmD7P2jwL780XJLZ4Xj6GY07npq1iGBcEZf\n"
160 "BuroD90fhdkK8EwMEVb9P17bdIc1MCIZFpUE9YHjVdK/oxCUhQ8KRfdbI4JU5Zh3\n" 160 "yCcdoyGkr9jgc5Auyis8DStGg/jfUBC4NBvF0GnuuNPAdYRPKUpKw9EatI+FdMjy\n"
161 "UtO6Jm2wFuP3VmeVpPvE/C2rxI70pyl6HMSiFGNc0rhJYCQ+yhohWj7nZ67H4vLx\n" 161 "BuroD90fhdkK8EwMEVb9P17bdIc1MCIZFpUE9YHjVdK/oxCUhQ8KRfdbI4JU5Zh3\n"
162 "plv5LxkCgYEAz7ewou8oFafDAMNoxaqKudvUg+lxXewdLDKaYBF5ACi9uAPCJ+v7\n" 162 "UtO6Jm2wFuP3VmeVpPvE/C2rxI70pyl6HMSiFGNc0rhJYCQ+yhohWj7nZ67H4vLx\n"
163 "M5c/fvPFn/XHzo7xaXbtTAH3Z5xzBs+80OsvL+e1Ut4xR+ELRkybknh/s2wQeABk\n" 163 "plv5LxkCgYEAz7ewou8oFafDAMNoxaqKudvUg+lxXewdLDKaYBF5ACi9uAPCJ+v7\n"
164 "Kb0vA59ukQGj12LV5phZMaVoXe6KJ7hZnN62d3K6m1wGE/k58i4pPLUCgYEA3hN8\n" 164 "M5c/fvPFn/XHzo7xaXbtTAH3Z5xzBs+80OsvL+e1Ut4xR+ELRkybknh/s2wQeABk\n"
165 "G95zW7g0jVdSr+KUeVmephph9yh8Yb+3I3ojwOIv6d45TopGx8pFZlnBAMZf1ZQx\n" 165 "Kb0vA59ukQGj12LV5phZMaVoXe6KJ7hZnN62d3K6m1wGE/k58i4pPLUCgYEA3hN8\n"
166 "DIhzJNnaqZy/4w7RNaOGWnPA/5f+MIoHBiLGEEmfHC3lt087Yp9OuwDUHwpETYdV\n" 166 "G95zW7g0jVdSr+KUeVmephph9yh8Yb+3I3ojwOIv6d45TopGx8pFZlnBAMZf1ZQx\n"
167 "o+KBCvVh60Et3bZUgF/1k/3YXxn8J5dsmJsjNqcCgYBLflyRa1BrRnTGMz9CEDCp\n" 167 "DIhzJNnaqZy/4w7RNaOGWnPA/5f+MIoHBiLGEEmfHC3lt087Yp9OuwDUHwpETYdV\n"
168 "Si9b3h1Y4Hbd2GppHhCXMTd6yMrpDYhYANGQB3M9Juv+s88j4JhwNoq/uonH4Pqk\n" 168 "o+KBCvVh60Et3bZUgF/1k/3YXxn8J5dsmJsjNqcCgYBLflyRa1BrRnTGMz9CEDCp\n"
169 "B8Y3qAQr4RuSH0WkwDUOsALhqBX4N1QwI1USAQEDbNAqeP5698X7GD3tXcQSmZrg\n" 169 "Si9b3h1Y4Hbd2GppHhCXMTd6yMrpDYhYANGQB3M9Juv+s88j4JhwNoq/uonH4Pqk\n"
170 "O8WfdjBCRNjkq4EW9xX/vQKBgQDONtmwJ0iHiu2BseyeVo/4fzfKlgUSNQ4K1rOA\n" 170 "B8Y3qAQr4RuSH0WkwDUOsALhqBX4N1QwI1USAQEDbNAqeP5698X7GD3tXcQSmZrg\n"
171 "xhIdMeu8Bxa/z7caHsGC4SVPSuYCtbE2Kh6BwapChcPJXCD45fgEViiJLuJiwEj1\n" 171 "O8WfdjBCRNjkq4EW9xX/vQKBgQDONtmwJ0iHiu2BseyeVo/4fzfKlgUSNQ4K1rOA\n"
172 "caTpyvNsf1IoffJvCe9ZxtMyX549P8ZOgC3Dt0hN5CBrGLwu2Ox5l+YrqT10pi+5\n" 172 "xhIdMeu8Bxa/z7caHsGC4SVPSuYCtbE2Kh6BwapChcPJXCD45fgEViiJLuJiwEj1\n"
173 "JZX1UQKBgQCrcXrdkkDAc/a4+PxNRpJRLcU4fhv8/lr+UWItE8eUe7bd25bTQfQm\n" 173 "caTpyvNsf1IoffJvCe9ZxtMyX549P8ZOgC3Dt0hN5CBrGLwu2Ox5l+YrqT10pi+5\n"
174 "VpNKc/kAJ66PjIED6fy3ADhd2y4naT2a24uAgQ/M494J68qLnGh6K4JU/09uxR2v\n" 174 "JZX1UQKBgQCrcXrdkkDAc/a4+PxNRpJRLcU4fhv8/lr+UWItE8eUe7bd25bTQfQm\n"
175 "1i2q/4FNLdFFk1XP4iNnTHRLZ+NYr2p5Y9RcvQfTjOauz8Ahav0lyg==\n" 175 "VpNKc/kAJ66PjIED6fy3ADhd2y4naT2a24uAgQ/M494J68qLnGh6K4JU/09uxR2v\n"
176 "-----END RSA PRIVATE KEY-----\n"; 176 "1i2q/4FNLdFFk1XP4iNnTHRLZ+NYr2p5Y9RcvQfTjOauz8Ahav0lyg==\n"
177 "-----END RSA PRIVATE KEY-----\n";
177 178
178#endif 179#endif