commit 6dbe969d4d872de57c333b01c03dd0493b9ae831 parent 6c84bcf3fe605365c9cb665445145fcfe279762a Author: Evgeny Grin (Karlson2k) <k2k@narod.ru> Date: Thu, 10 Jun 2021 21:09:25 +0300 tests: removed curl_uses_nss_ssl(), used new backend identification functions Diffstat:
12 files changed, 12 insertions(+), 25 deletions(-)
diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -75,9 +75,6 @@ int curl_check_version (const char *req_version, ...); int -curl_uses_nss_ssl (void); - -int curl_tls_is_gnutls (void); int