curl version testing support

This commit is contained in:
lv-426
2008-07-21 03:50:54 +00:00
parent 075c3c4203
commit c49560c811
9 changed files with 190 additions and 17 deletions
+10 -6
View File
@@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/daemon/https/x509 \
-I$(top_srcdir)/src/daemon
check_PROGRAMS = \
mhds_get_test \
tls_authentication_test \
@@ -18,31 +17,36 @@ check_PROGRAMS = \
TESTS = $(check_PROGRAMS)
tls_alert_test_SOURCES = \
tls_alert_test.c
tls_alert_test.c \
$(top_builddir)/src/testcurl/curl_version_check.c
tls_alert_test_LDADD = \
$(top_builddir)/src/daemon/libmicrohttpd.la \
@LIBCURL@
tls_authentication_test_SOURCES = \
tls_authentication_test.c
tls_authentication_test.c \
$(top_builddir)/src/testcurl/curl_version_check.c
tls_authentication_test_LDADD = \
$(top_builddir)/src/daemon/libmicrohttpd.la \
@LIBCURL@
mhds_get_test_SOURCES = \
mhds_get_test.c
mhds_get_test.c \
$(top_builddir)/src/testcurl/curl_version_check.c
mhds_get_test_LDADD = \
$(top_builddir)/src/daemon/libmicrohttpd.la \
@LIBCURL@
mhds_session_info_test_SOURCES = \
mhds_session_info_test.c
mhds_session_info_test.c \
$(top_builddir)/src/testcurl/curl_version_check.c
mhds_session_info_test_LDADD = \
$(top_builddir)/src/daemon/libmicrohttpd.la \
@LIBCURL@
mhds_multi_daemon_test_SOURCES = \
mhds_multi_daemon_test.c
mhds_multi_daemon_test.c \
$(top_builddir)/src/testcurl/curl_version_check.c
mhds_multi_daemon_test_LDADD = \
$(top_builddir)/src/daemon/libmicrohttpd.la \
@LIBCURL@
+9 -4
View File
@@ -51,6 +51,8 @@
const char *test_file_name = "https_test_file";
const char test_file_data[] = "Hello World\n";
extern int curl_check_version (const char *req_version, ...);
struct CBC
{
char *buf;
@@ -416,7 +418,10 @@ 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_SSL_VERSION))
{
return -1;
}
if ((test_fd = setupTestFile ()) == NULL)
{
@@ -443,10 +448,10 @@ main (int argc, char *const *argv)
test_kx_option (test_fd, "EDH-RSA-DES-CBC3-SHA", CURL_SSLVERSION_SSLv3);
curl_global_cleanup ();
fclose (test_fd);
curl_global_cleanup ();
fclose (test_fd);
remove (test_file_name);
remove (test_file_name);
return errorCount != 0;
}
@@ -48,6 +48,8 @@
const char *test_file_name = "https_test_file";
const char test_file_data[] = "Hello World\n";
extern int curl_check_version (const char *req_version, ...);
struct CBC
{
char *buf;
@@ -300,6 +302,11 @@ main (int argc, char *const *argv)
FILE *test_fd;
unsigned int errorCount = 0;
if (curl_check_version (MHD_REQ_CURL_VERSION, MHD_REQ_CURL_SSL_VERSION))
{
return -1;
}
if ((test_fd = setupTestFile ()) == NULL)
{
fprintf (stderr, MHD_E_TEST_FILE_CREAT);
@@ -40,6 +40,8 @@
#include "tls_test_keys.h"
extern int curl_check_version (const char *req_version, ...);
struct MHD_Daemon *d;
struct CBC
@@ -213,6 +215,11 @@ main (int argc, char *const *argv)
FILE *test_fd;
unsigned int errorCount = 0;
if (curl_check_version (MHD_REQ_CURL_VERSION, MHD_REQ_CURL_SSL_VERSION))
{
return -1;
}
if (0 != curl_global_init (CURL_GLOBAL_ALL))
{
fprintf (stderr, "Error (code: %u)\n", errorCount);
+7 -6
View File
@@ -48,6 +48,8 @@
#include "gnutls_datum.h"
#include "tls_test_keys.h"
extern int curl_check_version (const char *req_version, ...);
const char *ca_cert_file_name = "ca_cert_pem";
const char *test_file_name = "https_test_file";
const char test_file_data[] = "Hello World\n";
@@ -79,8 +81,6 @@ http_ahc (void *cls, struct MHD_Connection *connection,
static int
test_alert_response ()
{
int sd, ret;
char *err_pos;
struct sockaddr_in sa;
@@ -88,13 +88,11 @@ test_alert_response ()
gnutls_session_t session;
gnutls_certificate_credentials_t xcred;
gnutls_global_init ();
gnutls_datum_t key;
gnutls_datum_t cert;
gnutls_certificate_allocate_credentials (&xcred);
_gnutls_set_datum_m (&key, srv_key_pem, strlen (srv_key_pem), &malloc);
@@ -157,14 +155,17 @@ test_alert_response ()
}
int
main (int argc, char *const *argv)
{
int ret, errorCount = 0;;
struct MHD_Daemon *d;
if (curl_check_version (MHD_REQ_CURL_VERSION, MHD_REQ_CURL_SSL_VERSION))
{
return -1;
}
d = MHD_start_daemon (MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL |
MHD_USE_DEBUG, 42433,
NULL, NULL, &http_ahc, NULL,
@@ -46,6 +46,8 @@
#include "tls_test_keys.h"
extern int curl_check_version (const char *req_version, ...);
const char *ca_cert_file_name = "ca_cert_pem";
const char *test_file_name = "https_test_file";
const char test_file_data[] = "Hello World\n";
@@ -315,6 +317,11 @@ main (int argc, char *const *argv)
FILE *test_fd;
unsigned int errorCount = 0;
if (curl_check_version (MHD_REQ_CURL_VERSION, MHD_REQ_CURL_SSL_VERSION))
{
return -1;
}
if ((test_fd = setupTestFile ()) == NULL)
{
fprintf (stderr, MHD_E_TEST_FILE_CREAT);