From 6fde86c265e3beaf1a29a511ed4fafbec5fbd06a Mon Sep 17 00:00:00 2001 From: "Evgeny Grin (Karlson2k)" Date: Tue, 21 Nov 2023 13:42:18 +0300 Subject: [PATCH] test_digestauth2: fixed order of the initial checks This should improve reported warnings when test is skipped. --- src/testcurl/test_digestauth2.c | 41 +++++++++++++++++---------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/testcurl/test_digestauth2.c b/src/testcurl/test_digestauth2.c index ce2def62..e94f7b63 100644 --- a/src/testcurl/test_digestauth2.c +++ b/src/testcurl/test_digestauth2.c @@ -1532,6 +1532,27 @@ main (int argc, char *const *argv) 0xFF & (curl_info->version_num >> 0)); return 77; } + + if (test_sha256) + { + if (curl_sspi) + { + fprintf (stderr, "Windows SSPI API does not support SHA-256 digests.\n"); + return 77; + } + else if (CURL_VERSION_BITS (7,57,0) > curl_info->version_num) + { + fprintf (stderr, "Required libcurl at least version 7.57.0 " + "to run this test with SHA-256.\n"); + fprintf (stderr, "This libcurl version %u.%u.%u " + "does not support SHA-256.\n", + 0xFF & (curl_info->version_num >> 16), + 0xFF & (curl_info->version_num >> 8), + 0xFF & (curl_info->version_num >> 0)); + return 77; + } + } + if (test_userhash) { if (curl_sspi) @@ -1571,26 +1592,6 @@ main (int argc, char *const *argv) else curl_uses_usehash = 0; - if (test_sha256) - { - if (curl_sspi) - { - fprintf (stderr, "Windows SSPI API does not support SHA-256 digests.\n"); - return 77; - } - else if (CURL_VERSION_BITS (7,57,0) > curl_info->version_num) - { - fprintf (stderr, "Required libcurl at least version 7.57.0 " - "to run this test with SHA-256.\n"); - fprintf (stderr, "This libcurl version %u.%u.%u " - "does not support SHA-256.\n", - 0xFF & (curl_info->version_num >> 16), - 0xFF & (curl_info->version_num >> 8), - 0xFF & (curl_info->version_num >> 0)); - return 77; - } - } - test_global_init (); errorCount += testDigestAuth ();