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

getting gnutls tests to pass:

Browse Source
This commit is contained in:
Christian Grothoff committed 2010-07-25 09:47:50 +00:00
1 parent 67851b280e
commit 63b5f01682
11 files changed
+141 -266
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/testcurl/https/mhds_get_test.c
+4 -14
View File
@@ -43,14 +43,13 @@ test_cipher_option (FILE * test_fd, char *cipher_suite, int proto_version)
{
int ret;
int ciper[] = { GNUTLS_CIPHER_3DES_CBC, 0 };
struct MHD_Daemon *d;
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
MHD_USE_DEBUG, 42433,
NULL, NULL, &http_ahc, NULL,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_CIPHER_ALGORITHM, ciper, MHD_OPTION_END);
MHD_OPTION_END);
if (d == NULL)
{
@@ -90,37 +89,28 @@ test_secure_get (FILE * test_fd, char *cipher_suite, int proto_version)
return ret;
}
GCRY_THREAD_OPTION_PTHREAD_IMPL;
int
main (int argc, char *const *argv)
{
FILE *test_fd;
unsigned int errorCount = 0;
/* gnutls_global_set_log_level(11); */
if (curl_check_version (MHD_REQ_CURL_VERSION, MHD_REQ_CURL_OPENSSL_VERSION))
{
return -1;
}
gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
gnutls_global_set_log_level(11);
if (curl_check_version (MHD_REQ_CURL_VERSION, MHD_REQ_CURL_GNUTLS_VERSION))
return -1;
if (!gcry_check_version (GCRYPT_VERSION))
abort ();
if ((test_fd = setup_test_file ()) == NULL)
{
fprintf (stderr, MHD_E_TEST_FILE_CREAT);
return -1;
}
if (0 != curl_global_init (CURL_GLOBAL_ALL))
{
fprintf (stderr, "Error: %s\n", strerror (errno));
fclose (test_fd);
return -1;
}
errorCount +=
test_secure_get (test_fd, "AES256-SHA", CURL_SSLVERSION_TLSv1);
errorCount +=
src/testcurl/https/mhds_get_test_select.c
-2
View File
@@ -59,14 +59,12 @@ ahc_echo (void *cls,
if (&ptr != *unused)
{
*unused = &ptr;
fprintf (stderr, "received %s\n", method);
return MHD_YES;
}
*unused = NULL;
response = MHD_create_response_from_data (strlen (url),
(void *) url, MHD_NO, MHD_YES);
ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
fprintf (stderr, "sending reply\n");
MHD_destroy_response (response);
if (ret == MHD_NO)
abort ();
src/testcurl/https/mhds_session_info_test.c
+24 -13
View File
@@ -48,24 +48,33 @@ query_session_ahc (void *cls, struct MHD_Connection *connection,
{
struct MHD_Response *response;
int ret;
if (NULL == *ptr)
{
*ptr = &query_session_ahc;
return MHD_YES;
}
/* assert actual connection cipher is the one negotiated */
if (MHD_get_connection_info
(connection,
MHD_CONNECTION_INFO_CIPHER_ALGO)->cipher_algorithm !=
GNUTLS_CIPHER_AES_256_CBC)
if (GNUTLS_CIPHER_AES_256_CBC !=
(ret = MHD_get_connection_info
(connection,
MHD_CONNECTION_INFO_CIPHER_ALGO)->cipher_algorithm))
{
fprintf (stderr, "Error: requested cipher mismatch. %s\n",
strerror (errno));
fprintf (stderr, "Error: requested cipher mismatch (wanted %d, got %d)\n",
GNUTLS_CIPHER_AES_256_CBC,
ret);
return -1;
}
if (MHD_get_connection_info
(connection,
MHD_CONNECTION_INFO_PROTOCOL)->protocol != GNUTLS_SSL3)
if (GNUTLS_SSL3 !=
(ret = MHD_get_connection_info
(connection,
MHD_CONNECTION_INFO_PROTOCOL)->protocol))
{
fprintf (stderr, "Error: requested compression mismatch. %s\n",
strerror (errno));
fprintf (stderr, "Error: requested protocol mismatch (wanted %d, got %d)\n",
GNUTLS_SSL3,
ret);
return -1;
}
@@ -99,6 +108,7 @@ test_query_session ()
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
MHD_USE_DEBUG, DEAMON_TEST_PORT,
NULL, NULL, &query_session_ahc, NULL,
MHD_OPTION_HTTPS_PRIORITIES, "NORMAL:-AES-128-CBC",
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_END);
@@ -167,6 +177,7 @@ main (int argc, char *const *argv)
print_test_result (errorCount, argv[0]);
curl_global_cleanup ();
return errorCount != 0;
if (errorCount > 0)
fprintf (stderr, "Error (code: %u)\n", errorCount);
return errorCount;
}
src/testcurl/https/tls_daemon_options_test.c
+48 -48
View File
@@ -28,6 +28,7 @@
#include "microhttpd.h"
#include <sys/stat.h>
#include <limits.h>
#include <gcrypt.h>
#include "tls_test_common.h"
extern const char srv_key_pem[];
@@ -40,7 +41,7 @@ int curl_check_version (const char *req_version, ...);
*
*/
/* TODO rm test_fd */
static int
int
test_unmatching_ssl_version (FILE * test_fd, char *cipher_suite,
int curl_req_ssl_version)
{
@@ -79,12 +80,11 @@ main (int argc, char *const *argv)
{
FILE *test_fd;
unsigned int errorCount = 0;
unsigned int cpos;
char test_name[64];
int daemon_flags =
MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | MHD_USE_DEBUG;
gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
if (curl_check_version (MHD_REQ_CURL_VERSION))
{
return -1;
@@ -103,46 +103,39 @@ main (int argc, char *const *argv)
fprintf (stderr, "Error: %s\n", strerror (errno));
return -1;
}
#if 0
errorCount +=
test_wrap ("TLS1.0-AES-SHA1",
&test_https_transfer, test_fd, daemon_flags,
"AES128-SHA1",
CURL_SSLVERSION_TLSv1,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
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);
#endif
#if 0
errorCount +=
test_wrap ("TLS1.0-AES-SHA1",
&test_https_transfer, test_fd, daemon_flags,
"AES128-SHA1",
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_END);
errorCount +=
test_wrap ("SSL3.0-AES-SHA1",
&test_https_transfer, test_fd, daemon_flags,
"AES128-SHA1",
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_END);
#endif
struct CipherDef ciphers[] = {
{{GNUTLS_CIPHER_AES_128_CBC, 0}, "AES128-SHA"},
{{GNUTLS_CIPHER_ARCFOUR_128, 0}, "RC4-SHA"},
{{GNUTLS_CIPHER_3DES_CBC, 0}, "3DES-SHA"},
{{GNUTLS_CIPHER_AES_256_CBC, 0}, "AES256-SHA"},
{{0, 0}, NULL}
};
fprintf (stderr, "SHA/TLS tests:\n");
cpos = 0;
while (ciphers[cpos].curlname != NULL)
{
sprintf (test_name, "%s-TLS", ciphers[cpos].curlname);
errorCount +=
test_wrap (test_name,
&test_https_transfer, test_fd, daemon_flags,
ciphers[cpos].curlname,
CURL_SSLVERSION_TLSv1,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_CIPHER_ALGORITHM, "NORMAL",
MHD_OPTION_END);
cpos++;
}
fprintf (stderr, "SHA/SSL3 tests:\n");
cpos = 0;
while (ciphers[cpos].curlname != NULL)
{
sprintf (test_name, "%s-SSL3", ciphers[cpos].curlname);
errorCount +=
test_wrap (test_name,
&test_https_transfer, test_fd, daemon_flags,
ciphers[cpos].curlname,
CURL_SSLVERSION_SSLv3,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_CIPHER_ALGORITHM, "NORMAL",
MHD_OPTION_END);
cpos++;
}
#if 0
/* manual inspection of the handshake suggests that CURL will
request TLSv1, we send back "SSL3" and CURL takes it *despite*
@@ -158,12 +151,19 @@ main (int argc, char *const *argv)
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_CIPHER_ALGORITHM, "SSL3", MHD_OPTION_END);
#endif
#if 1
errorCount +=
test_wrap ("unmatching version: TLS vs. SSL3", &test_unmatching_ssl_version,
test_fd, daemon_flags, "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_CIPHER_ALGORITHM, "SSL3", MHD_OPTION_END);
test_wrap ("TLS1.0 vs SSL3",
&test_unmatching_ssl_version, test_fd, daemon_flags,
"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-TLS1.0:+AES-256-CBC:+SHA1:+RSA:+COMP-NULL",
MHD_OPTION_END);
#endif
curl_global_cleanup ();
fclose (test_fd);
remove (TEST_FILE_NAME);