[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] 03/04: tests: removed curl_uses_nss_ssl(), used new back
|
From: |
gnunet |
|
Subject: |
[libmicrohttpd] 03/04: tests: removed curl_uses_nss_ssl(), used new backend identification functions |
|
Date: |
Thu, 10 Jun 2021 20:26:10 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 6dbe969d4d872de57c333b01c03dd0493b9ae831
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Thu Jun 10 21:09:25 2021 +0300
tests: removed curl_uses_nss_ssl(), used new backend identification
functions
---
src/testcurl/curl_version_check.c | 10 ----------
src/testcurl/https/test_empty_response.c | 2 +-
src/testcurl/https/test_https_get.c | 2 +-
src/testcurl/https/test_https_get_iovec.c | 2 +-
src/testcurl/https/test_https_get_parallel.c | 2 +-
src/testcurl/https/test_https_get_parallel_threads.c | 4 ++--
src/testcurl/https/test_https_get_select.c | 2 +-
src/testcurl/https/test_https_multi_daemon.c | 2 +-
src/testcurl/https/test_https_session_info.c | 4 ++--
src/testcurl/https/test_tls_authentication.c | 2 +-
src/testcurl/https/test_tls_options.c | 2 +-
src/testcurl/https/tls_test_common.h | 3 ---
12 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/src/testcurl/curl_version_check.c
b/src/testcurl/curl_version_check.c
index 315c50ce..e77cf7d6 100644
--- a/src/testcurl/curl_version_check.c
+++ b/src/testcurl/curl_version_check.c
@@ -69,16 +69,6 @@ parse_version_string (const char *s, int *major, int *minor,
int *micro)
}
-#ifdef HTTPS_SUPPORT
-int
-curl_uses_nss_ssl ()
-{
- return (strstr (curl_version (), " NSS/") != NULL) ? 0 : -1;
-}
-
-
-#endif /* HTTPS_SUPPORT */
-
/*
* check local libcurl version matches required version
*/
diff --git a/src/testcurl/https/test_empty_response.c
b/src/testcurl/https/test_empty_response.c
index bf05baca..83f208b3 100644
--- a/src/testcurl/https/test_empty_response.c
+++ b/src/testcurl/https/test_empty_response.c
@@ -108,7 +108,7 @@ testInternalSelectGet ()
}
port = (int) dinfo->port;
}
- if (curl_uses_nss_ssl () == 0)
+ if (curl_tls_is_nss ())
{
aes256_sha = "rsa_aes_256_sha";
}
diff --git a/src/testcurl/https/test_https_get.c
b/src/testcurl/https/test_https_get.c
index b3f2fbf7..d7e534ed 100644
--- a/src/testcurl/https/test_https_get.c
+++ b/src/testcurl/https/test_https_get.c
@@ -253,7 +253,7 @@ main (int argc, char *const *argv)
return 77;
}
- if (curl_uses_nss_ssl () == 0)
+ if (curl_tls_is_nss ())
{
aes256_sha_tlsv1 = "rsa_aes_256_sha";
}
diff --git a/src/testcurl/https/test_https_get_iovec.c
b/src/testcurl/https/test_https_get_iovec.c
index 28d5cbfc..ab2bf35d 100644
--- a/src/testcurl/https/test_https_get_iovec.c
+++ b/src/testcurl/https/test_https_get_iovec.c
@@ -408,7 +408,7 @@ main (int argc, char *const *argv)
return 77;
}
- if (curl_uses_nss_ssl () == 0)
+ if (curl_tls_is_nss ())
{
aes256_sha_tlsv1 = "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 cce97fca..47f644d2 100644
--- a/src/testcurl/https/test_https_get_parallel.c
+++ b/src/testcurl/https/test_https_get_parallel.c
@@ -159,7 +159,7 @@ main (int argc, char *const *argv)
fprintf (stderr, "Curl does not support SSL. Cannot run the test.\n");
return 77;
}
- if (curl_uses_nss_ssl () == 0)
+ if (curl_tls_is_nss ())
aes256_sha = "rsa_aes_256_sha";
#ifdef EPOLL_SUPPORT
errorCount +=
diff --git a/src/testcurl/https/test_https_get_parallel_threads.c
b/src/testcurl/https/test_https_get_parallel_threads.c
index 4a7d1b1d..4853e7eb 100644
--- a/src/testcurl/https/test_https_get_parallel_threads.c
+++ b/src/testcurl/https/test_https_get_parallel_threads.c
@@ -169,14 +169,14 @@ main (int argc, char *const *argv)
curl_global_cleanup ();
return 77;
}
- if (0 != strncmp (ssl_version, "GnuTLS", 6))
+ if (! curl_tls_is_gnutls ())
{
fprintf (stderr, "This test can be run only with libcurl-gnutls.\n");
curl_global_cleanup ();
return 77;
}
- if (curl_uses_nss_ssl () == 0)
+ if (curl_tls_is_nss ())
{
aes256_sha = "rsa_aes_256_sha";
}
diff --git a/src/testcurl/https/test_https_get_select.c
b/src/testcurl/https/test_https_get_select.c
index d42f4463..ce89ee42 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -125,7 +125,7 @@ testExternalGet (int flags)
port = (int) dinfo->port;
}
- if (curl_uses_nss_ssl () == 0)
+ if (curl_tls_is_nss ())
aes256_sha = "rsa_aes_256_sha";
c = curl_easy_init ();
diff --git a/src/testcurl/https/test_https_multi_daemon.c
b/src/testcurl/https/test_https_multi_daemon.c
index 598d5592..6c6e2b5d 100644
--- a/src/testcurl/https/test_https_multi_daemon.c
+++ b/src/testcurl/https/test_https_multi_daemon.c
@@ -155,7 +155,7 @@ main (int argc, char *const *argv)
return 99;
}
- if (curl_uses_nss_ssl () == 0)
+ if (curl_tls_is_nss ())
{
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 9ca97b36..d594753e 100644
--- a/src/testcurl/https/test_https_session_info.c
+++ b/src/testcurl/https/test_https_session_info.c
@@ -143,7 +143,7 @@ test_query_session ()
port = (int) dinfo->port;
}
- if (curl_uses_nss_ssl () == 0)
+ if (curl_tls_is_nss ())
{
aes256_sha = "rsa_aes_256_sha";
}
@@ -217,7 +217,7 @@ main (int argc, char *const *argv)
curl_global_cleanup ();
return 77;
}
- if (0 != strncmp (ssl_version, "GnuTLS", 6))
+ if (! curl_tls_is_gnutls ())
{
fprintf (stderr, "This test can be run only with libcurl-gnutls.\n");
curl_global_cleanup ();
diff --git a/src/testcurl/https/test_tls_authentication.c
b/src/testcurl/https/test_tls_authentication.c
index 7ca75138..7aedee72 100644
--- a/src/testcurl/https/test_tls_authentication.c
+++ b/src/testcurl/https/test_tls_authentication.c
@@ -114,7 +114,7 @@ main (int argc, char *const *argv)
return 99;
}
fclose (crt);
- if (curl_uses_nss_ssl () == 0)
+ if (curl_tls_is_nss ())
{
aes256_sha = "rsa_aes_256_sha";
}
diff --git a/src/testcurl/https/test_tls_options.c
b/src/testcurl/https/test_tls_options.c
index f42e324b..c9d4209c 100644
--- a/src/testcurl/https/test_tls_options.c
+++ b/src/testcurl/https/test_tls_options.c
@@ -128,7 +128,7 @@ main (int argc, char *const *argv)
if (! testsuite_curl_global_init ())
return 99;
- if (curl_uses_nss_ssl () == 0)
+ if (curl_tls_is_nss ())
{
aes128_sha = "rsa_aes_128_sha";
aes256_sha = "rsa_aes_256_sha";
diff --git a/src/testcurl/https/tls_test_common.h
b/src/testcurl/https/tls_test_common.h
index 6362bb14..02f0f0fa 100644
--- a/src/testcurl/https/tls_test_common.h
+++ b/src/testcurl/https/tls_test_common.h
@@ -74,9 +74,6 @@ struct CipherDef
int
curl_check_version (const char *req_version, ...);
-int
-curl_uses_nss_ssl (void);
-
int
curl_tls_is_gnutls (void);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.