mirrors/libmicrohttpd
2
0
Fork 0
mirror of https://git.gnunet.org/libmicrohttpd.git synced 2026-09-25 04:09:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

https tests: renamed private key variable to match certificate name

Browse Source
This commit is contained in:
Evgeny Grin (Karlson2k)
2022-10-10 13:45:35 +03:00
parent b84dc1b220
commit 868cb71aa2
9 changed files with 60 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/testcurl/https/test_empty_response.c
+1 -1
View File
@@ -88,7 +88,7 @@ testInternalSelectGet (void)
d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS
| MHD_USE_INTERNAL_POLLING_THREAD,
port, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);
if (d == NULL)
src/testcurl/https/test_https_get_parallel.c
+4 -4
View File
@@ -160,7 +160,7 @@ main (int argc, char *const *argv)
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
| MHD_USE_ERROR_LOG | MHD_USE_EPOLL,
NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
#endif
errorCount +=
@@ -169,7 +169,7 @@ main (int argc, char *const *argv)
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
| MHD_USE_ERROR_LOG,
NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
#ifdef EPOLL_SUPPORT
errorCount +=
@@ -178,7 +178,7 @@ main (int argc, char *const *argv)
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
| MHD_USE_ERROR_LOG | MHD_USE_EPOLL,
NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
#endif
errorCount +=
@@ -187,7 +187,7 @@ main (int argc, char *const *argv)
MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
| MHD_USE_ERROR_LOG,
NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
curl_global_cleanup ();
src/testcurl/https/test_https_get_parallel_threads.c
+2 -2
View File
@@ -169,7 +169,7 @@ main (int argc, char *const *argv)
MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION
| MHD_USE_INTERNAL_POLLING_THREAD,
NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
errorCount +=
@@ -178,7 +178,7 @@ main (int argc, char *const *argv)
MHD_USE_TLS | MHD_USE_ERROR_LOG | MHD_USE_THREAD_PER_CONNECTION
| MHD_USE_INTERNAL_POLLING_THREAD,
NULL, CURL_SSLVERSION_DEFAULT, MHD_OPTION_HTTPS_MEM_KEY,
srv_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_key_pem, MHD_OPTION_HTTPS_MEM_CERT,
srv_self_signed_cert_pem, MHD_OPTION_END);
if (errorCount != 0)
src/testcurl/https/test_https_get_select.c
+1 -1
View File
@@ -105,7 +105,7 @@ testExternalGet (unsigned int flags)
cbc.pos = 0;
d = MHD_start_daemon (MHD_USE_ERROR_LOG | MHD_USE_TLS | flags,
port, NULL, NULL, &ahc_echo, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);
if (d == NULL)
src/testcurl/https/test_https_multi_daemon.c
+2 -2
View File
@@ -63,7 +63,7 @@ test_concurent_daemon_pair (void *cls,
| MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
| MHD_USE_ERROR_LOG, port1,
NULL, NULL, &http_ahc, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);
@@ -89,7 +89,7 @@ test_concurent_daemon_pair (void *cls,
| MHD_USE_INTERNAL_POLLING_THREAD | MHD_USE_TLS
| MHD_USE_ERROR_LOG, port2,
NULL, NULL, &http_ahc, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);
src/testcurl/https/test_https_session_info.c
+19 -23
View File
@@ -35,8 +35,6 @@
#include "tls_test_common.h"
#include "tls_test_keys.h"
static struct MHD_Daemon *d;
/*
* HTTP access handler call back
* used to query negotiated security parameters
@@ -101,6 +99,7 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
CURLcode errornum;
char url[256];
enum know_gnutls_tls_id found_tls_ver;
struct MHD_Daemon *d;
if (NULL == (cbc.buf = malloc (sizeof (char) * 255)))
return 99;
@@ -115,15 +114,13 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
NULL, NULL,
&query_info_ahc, &found_tls_ver,
MHD_OPTION_HTTPS_PRIORITIES, priorities_map[tls_ver],
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);
if (d == NULL)
{
free (cbc.buf);
fflush (stderr);
fflush (stdout);
fprintf (stderr, "MHD_start_daemon() with %s failed.\n",
tls_names[tls_ver]);
fflush (stderr);
@@ -136,11 +133,9 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
if ((NULL == dinfo) || (0 == dinfo->port) )
{
MHD_stop_daemon (d);
fflush (stderr);
fflush (stdout);
free (cbc.buf);
fprintf (stderr, "MHD_get_daemon_info() failed.\n");
fflush (stderr);
free (cbc.buf);
return 10;
}
*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)
sizeof (url),
*pport);
c = curl_easy_init ();
fflush (stderr);
if (NULL == c)
{
fprintf (stderr, "curl_easy_init() failed.\n");
fflush (stderr);
MHD_stop_daemon (d);
free (cbc.buf);
return 99;
}
#ifdef _DEBUG
curl_easy_setopt (c, CURLOPT_VERBOSE, 1L);
#endif
@@ -174,6 +178,9 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
(errornum = curl_easy_setopt (c, CURLOPT_FAILONERROR, 1L))) ||
(CURLE_OK != (errornum = curl_easy_setopt (c, CURLOPT_NOSIGNAL, 1L))))
{
curl_easy_cleanup (c);
free (cbc.buf);
MHD_stop_daemon (d);
fflush (stderr);
fflush (stdout);
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)
if (CURLE_OK != (errornum = curl_easy_perform (c)))
{
unsigned int ret;
MHD_stop_daemon (d);
curl_easy_cleanup (c);
free (cbc.buf);
MHD_stop_daemon (d);
fflush (stderr);
fflush (stdout);
@@ -211,8 +218,8 @@ test_query_session (enum know_gnutls_tls_id tls_ver, uint16_t *pport)
}
curl_easy_cleanup (c);
MHD_stop_daemon (d);
free (cbc.buf);
MHD_stop_daemon (d);
if (tls_ver != found_tls_ver)
{
@@ -250,10 +257,7 @@ test_all_supported_versions (void)
vers_list = gnutls_protocol_list ();
if (NULL == vers_list)
{
fflush (stderr);
fflush (stdout);
fprintf (stderr, "Error getting GnuTLS supported TLS versions");
fflush (stdout);
return 99;
}
num_success = 0;
@@ -271,28 +275,25 @@ test_all_supported_versions (void)
}
if (0 == *ver_ptr)
{
fflush (stderr);
printf ("%s is not supported by GnuTLS, skipping.\n\n",
tls_names[ver_for_test]);
fflush (stdout);
continue;
}
fflush (stderr);
printf ("Starting check for %s...\n",
tls_names[ver_for_test]);
fflush (stdout);
res = test_query_session (ver_for_test, &port);
fflush (stderr);
fflush (stdout);
if (99 == res)
{
fflush (stderr);
fflush (stdout);
fprintf (stderr, "Hard error. Test stopped.\n");
fflush (stderr);
return 99;
}
else if (77 == res)
{
fflush (stderr);
printf ("%s does not work with libcurl client and GnuTLS "
"server combination, skipping.\n",
tls_names[ver_for_test]);
@@ -300,8 +301,6 @@ test_all_supported_versions (void)
}
else if (0 != res)
{
fflush (stderr);
fflush (stdout);
fprintf (stderr, "Check failed for %s.\n",
tls_names[ver_for_test]);
fflush (stderr);
@@ -309,7 +308,6 @@ test_all_supported_versions (void)
}
else
{
fflush (stderr);
printf ("Check succeeded for %s.\n",
tls_names[ver_for_test]);
fflush (stdout);
@@ -323,8 +321,6 @@ test_all_supported_versions (void)
{
if (0 == num_success)
{
fflush (stderr);
fflush (stdout);
fprintf (stderr, "No supported TLS version was found.\n");
fflush (stderr);
return 77;
src/testcurl/https/test_https_time_out.c
+1 -1
View File
@@ -241,7 +241,7 @@ main (int argc, char *const *argv)
MHD_OPTION_CONNECTION_TIMEOUT,
(unsigned int) timeout_val,
MHD_OPTION_NOTIFY_CONNECTION, &socket_cb, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);
src/testcurl/https/test_tls_options.c
+2 -2
View File
@@ -99,7 +99,7 @@ check_tls_match_inner (enum know_gnutls_tls_id tls_ver_mhd,
NULL, NULL,
&simple_ahc, NULL,
MHD_OPTION_HTTPS_PRIORITIES, priorities_map[tls_ver_mhd],
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_KEY, srv_self_signed_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);
fflush (stderr);
@@ -415,7 +415,7 @@ test_first_supported_versions (void)
}
}
fprintf (stderr, "The test skipped: No know TLS version is supported by "
fprintf (stderr, "The test skipped: No know TLS versions are supported by "
"both MHD and libcurl.\n");
fflush (stderr);
return 77;
src/testcurl/https/tls_test_keys.h
+28 -27
View File
@@ -147,32 +147,33 @@ static const char srv_self_signed_cert_pem[] = "-----BEGIN CERTIFICATE-----\n"
"-----END CERTIFICATE-----\n";
/* test server key */
static const char srv_key_pem[] = "-----BEGIN RSA PRIVATE KEY-----\n"
"MIIEpAIBAAKCAQEAtDEagv3p9OUhUL55jMucxjNK9N5cuozhcnrwDfBSU6oVrqm5\n"
"kPqO1I7Cggzw68Y5jhTcBi4FXmYOZppm1R3MhSJ5JSi/67Q7X4J5rnJLXYGN27qj\n"
"MpnoGQ/2xmsNG/isi+h/2vbtPU+WP9SEJnTfPLLpZ7KqCAk7FUUzKsuLx3/SOKtd\n"
"krWxPKwYTgnDEN6DJL7tEzCnG5DFc4mQ7YW9PaRdC3rS1T8PvQ3jB2BUnohM0cFv\n"
"KRuiU35tU7h7CPbL4L66VglXoiwqmgcrwI2U968bD0+wRQ5c5bzNoshJOzN6CTMh\n"
"1IhbklSh/Z6FA/e8hj0yVo2tdllXuJGVs3PIEwIDAQABAoIBAAEtcg+LFLGtoxjq\n"
"b+tFttBJfbRcfdG6ocYqBGmUXF+MgFs573DHX3sHNOQxlaNHtSgIclF1eYgNZFFt\n"
"VLIoBFTzfEQXoFosPUDoEuqVMeXLttmD7P2jwL780XJLZ4Xj6GY07npq1iGBcEZf\n"
"yCcdoyGkr9jgc5Auyis8DStGg/jfUBC4NBvF0GnuuNPAdYRPKUpKw9EatI+FdMjy\n"
"BuroD90fhdkK8EwMEVb9P17bdIc1MCIZFpUE9YHjVdK/oxCUhQ8KRfdbI4JU5Zh3\n"
"UtO6Jm2wFuP3VmeVpPvE/C2rxI70pyl6HMSiFGNc0rhJYCQ+yhohWj7nZ67H4vLx\n"
"plv5LxkCgYEAz7ewou8oFafDAMNoxaqKudvUg+lxXewdLDKaYBF5ACi9uAPCJ+v7\n"
"M5c/fvPFn/XHzo7xaXbtTAH3Z5xzBs+80OsvL+e1Ut4xR+ELRkybknh/s2wQeABk\n"
"Kb0vA59ukQGj12LV5phZMaVoXe6KJ7hZnN62d3K6m1wGE/k58i4pPLUCgYEA3hN8\n"
"G95zW7g0jVdSr+KUeVmephph9yh8Yb+3I3ojwOIv6d45TopGx8pFZlnBAMZf1ZQx\n"
"DIhzJNnaqZy/4w7RNaOGWnPA/5f+MIoHBiLGEEmfHC3lt087Yp9OuwDUHwpETYdV\n"
"o+KBCvVh60Et3bZUgF/1k/3YXxn8J5dsmJsjNqcCgYBLflyRa1BrRnTGMz9CEDCp\n"
"Si9b3h1Y4Hbd2GppHhCXMTd6yMrpDYhYANGQB3M9Juv+s88j4JhwNoq/uonH4Pqk\n"
"B8Y3qAQr4RuSH0WkwDUOsALhqBX4N1QwI1USAQEDbNAqeP5698X7GD3tXcQSmZrg\n"
"O8WfdjBCRNjkq4EW9xX/vQKBgQDONtmwJ0iHiu2BseyeVo/4fzfKlgUSNQ4K1rOA\n"
"xhIdMeu8Bxa/z7caHsGC4SVPSuYCtbE2Kh6BwapChcPJXCD45fgEViiJLuJiwEj1\n"
"caTpyvNsf1IoffJvCe9ZxtMyX549P8ZOgC3Dt0hN5CBrGLwu2Ox5l+YrqT10pi+5\n"
"JZX1UQKBgQCrcXrdkkDAc/a4+PxNRpJRLcU4fhv8/lr+UWItE8eUe7bd25bTQfQm\n"
"VpNKc/kAJ66PjIED6fy3ADhd2y4naT2a24uAgQ/M494J68qLnGh6K4JU/09uxR2v\n"
"1i2q/4FNLdFFk1XP4iNnTHRLZ+NYr2p5Y9RcvQfTjOauz8Ahav0lyg==\n"
"-----END RSA PRIVATE KEY-----\n";
static const char srv_self_signed_key_pem[] =
"-----BEGIN RSA PRIVATE KEY-----\n"
"MIIEpAIBAAKCAQEAtDEagv3p9OUhUL55jMucxjNK9N5cuozhcnrwDfBSU6oVrqm5\n"
"kPqO1I7Cggzw68Y5jhTcBi4FXmYOZppm1R3MhSJ5JSi/67Q7X4J5rnJLXYGN27qj\n"
"MpnoGQ/2xmsNG/isi+h/2vbtPU+WP9SEJnTfPLLpZ7KqCAk7FUUzKsuLx3/SOKtd\n"
"krWxPKwYTgnDEN6DJL7tEzCnG5DFc4mQ7YW9PaRdC3rS1T8PvQ3jB2BUnohM0cFv\n"
"KRuiU35tU7h7CPbL4L66VglXoiwqmgcrwI2U968bD0+wRQ5c5bzNoshJOzN6CTMh\n"
"1IhbklSh/Z6FA/e8hj0yVo2tdllXuJGVs3PIEwIDAQABAoIBAAEtcg+LFLGtoxjq\n"
"b+tFttBJfbRcfdG6ocYqBGmUXF+MgFs573DHX3sHNOQxlaNHtSgIclF1eYgNZFFt\n"
"VLIoBFTzfEQXoFosPUDoEuqVMeXLttmD7P2jwL780XJLZ4Xj6GY07npq1iGBcEZf\n"
"yCcdoyGkr9jgc5Auyis8DStGg/jfUBC4NBvF0GnuuNPAdYRPKUpKw9EatI+FdMjy\n"
"BuroD90fhdkK8EwMEVb9P17bdIc1MCIZFpUE9YHjVdK/oxCUhQ8KRfdbI4JU5Zh3\n"
"UtO6Jm2wFuP3VmeVpPvE/C2rxI70pyl6HMSiFGNc0rhJYCQ+yhohWj7nZ67H4vLx\n"
"plv5LxkCgYEAz7ewou8oFafDAMNoxaqKudvUg+lxXewdLDKaYBF5ACi9uAPCJ+v7\n"
"M5c/fvPFn/XHzo7xaXbtTAH3Z5xzBs+80OsvL+e1Ut4xR+ELRkybknh/s2wQeABk\n"
"Kb0vA59ukQGj12LV5phZMaVoXe6KJ7hZnN62d3K6m1wGE/k58i4pPLUCgYEA3hN8\n"
"G95zW7g0jVdSr+KUeVmephph9yh8Yb+3I3ojwOIv6d45TopGx8pFZlnBAMZf1ZQx\n"
"DIhzJNnaqZy/4w7RNaOGWnPA/5f+MIoHBiLGEEmfHC3lt087Yp9OuwDUHwpETYdV\n"
"o+KBCvVh60Et3bZUgF/1k/3YXxn8J5dsmJsjNqcCgYBLflyRa1BrRnTGMz9CEDCp\n"
"Si9b3h1Y4Hbd2GppHhCXMTd6yMrpDYhYANGQB3M9Juv+s88j4JhwNoq/uonH4Pqk\n"
"B8Y3qAQr4RuSH0WkwDUOsALhqBX4N1QwI1USAQEDbNAqeP5698X7GD3tXcQSmZrg\n"
"O8WfdjBCRNjkq4EW9xX/vQKBgQDONtmwJ0iHiu2BseyeVo/4fzfKlgUSNQ4K1rOA\n"
"xhIdMeu8Bxa/z7caHsGC4SVPSuYCtbE2Kh6BwapChcPJXCD45fgEViiJLuJiwEj1\n"
"caTpyvNsf1IoffJvCe9ZxtMyX549P8ZOgC3Dt0hN5CBrGLwu2Ox5l+YrqT10pi+5\n"
"JZX1UQKBgQCrcXrdkkDAc/a4+PxNRpJRLcU4fhv8/lr+UWItE8eUe7bd25bTQfQm\n"
"VpNKc/kAJ66PjIED6fy3ADhd2y4naT2a24uAgQ/M494J68qLnGh6K4JU/09uxR2v\n"
"1i2q/4FNLdFFk1XP4iNnTHRLZ+NYr2p5Y9RcvQfTjOauz8Ahav0lyg==\n"
"-----END RSA PRIVATE KEY-----\n";
#endif