From 1adf04a494294c3da8e2f22a8e2e0b5bef752573 Mon Sep 17 00:00:00 2001 From: Hideki Miyazaki Date: Sun, 4 Aug 2024 13:51:06 +0900 Subject: [PATCH] fix pr test --- examples/client/client.c | 6 +++--- scripts/ocsp-stapling.test | 2 +- scripts/ocsp-stapling_tls13multi.test | 8 -------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/examples/client/client.c b/examples/client/client.c index bfd7fd273a..b8f9cbfe11 100644 --- a/examples/client/client.c +++ b/examples/client/client.c @@ -1222,8 +1222,8 @@ static const char* client_usage_msg[][78] = { "-W Use OCSP Stapling (1 v1, 2 v2, 3 v2 multi)\n", /* 41 */ " With 'm' at end indicates MUST staple\n", /* 42 */ #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_TLS_OCSP_MULTI) - " -W 1 tls13 multi. Perform multi OCSP stapling when" - " using TLS13\n", /* 43 */ + " -W 1 -v 4, Perform multi OCSP stapling for TLS13\n", + /* 43 */ #endif #endif #if defined(ATOMIC_USER) && !defined(WOLFSSL_AEAD_ONLY) @@ -1454,7 +1454,7 @@ static const char* client_usage_msg[][78] = { " (1 v1, 2 v2, 3 v2 multi)\n", /* 41 */ " 'm' を最後に指定すると必ず staple を使用する\n" /* 42 */ #if defined(WOLFSSL_TLS13) && defined(WOLFSSL_TLS_OCSP_MULTI) - " -W 1 tls13 multi. " + " -W 1 -v 4, " "TLS13 使用時に複数(Multi)の OCSP を実施します\n" /* 43 */ #endif #endif diff --git a/scripts/ocsp-stapling.test b/scripts/ocsp-stapling.test index 4060197f5f..7c5f5a70dc 100755 --- a/scripts/ocsp-stapling.test +++ b/scripts/ocsp-stapling.test @@ -27,7 +27,7 @@ fi if ./examples/client/client -? 2>&1 | grep -q 'DTLSv1.3'; then dtls13=yes fi -./examples/client/client '-?' 2>&1 | grep -- 'tls13 multi' +./examples/client/client '-?' 2>&1 | grep -- 'Perform multi OCSP stapling for TLS13' if [ $? -eq 0 ]; then tls13multi=yes else diff --git a/scripts/ocsp-stapling_tls13multi.test b/scripts/ocsp-stapling_tls13multi.test index 7c9a66aae8..d66f9245c0 100755 --- a/scripts/ocsp-stapling_tls13multi.test +++ b/scripts/ocsp-stapling_tls13multi.test @@ -5,14 +5,6 @@ SCRIPT_DIR="$(dirname "$0")" -./examples/client/client -? 2>&1 | grep -- 'tls13 multi' -if [ $? -eq 0 ]; then - echo "Ocsp stapling multi under TLS13 will run" -else - echo "Ocsp stapling multi under TLS13 won't run" - exit 77 -fi - # if we can, isolate the network namespace to eliminate port collisions. if [[ -n "$NETWORK_UNSHARE_HELPER" ]]; then if [[ -z "$NETWORK_UNSHARE_HELPER_CALLED" ]]; then