From 8a1e90767b2f8656883c9d6dac51462559a3286a Mon Sep 17 00:00:00 2001 From: Dirk Wetter Date: Tue, 3 Oct 2023 15:00:04 +0200 Subject: [PATCH 1/3] add busybox link to tar See #2403 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 85dfc32..c4c1aca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,8 @@ FROM scratch ARG INSTALL_ROOT COPY --link --from=builder ${INSTALL_ROOT} / # Create user + (home with SGID set): -RUN echo 'testssl:x:1000:1000::/home/testssl:/bin/bash' >> /etc/passwd \ +RUN ln -s /usr/bin/busybox /usr/bin/tar \ + && echo 'testssl:x:1000:1000::/home/testssl:/bin/bash' >> /etc/passwd \ && echo 'testssl:x:1000:' >> /etc/group \ && echo 'testssl:!::0:::::' >> /etc/shadow \ && install --mode 2755 --owner testssl --group testssl --directory /home/testssl \ From dc8721ca200eea274b20e06094cd2acb1534102c Mon Sep 17 00:00:00 2001 From: Dirk Wetter Date: Tue, 3 Oct 2023 15:06:46 +0200 Subject: [PATCH 2/3] fix spellcheck issues --- .github/workflows/codespell.yml | 2 +- testssl.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 481f74b..9c52024 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -13,4 +13,4 @@ jobs: - uses: codespell-project/actions-codespell@master with: skip: ca_hashes.txt,tls_data.txt,*.pem,OPENSSL-LICENSE.txt - ignore_words_list: borken,gost,ciph,ba,bloc,isnt,chello,fo,alle,anull + ignore_words_list: borken,gost,ciph,ba,bloc,isnt,chello,fo,alle,anull,Widgits,Manuel diff --git a/testssl.sh b/testssl.sh index 3de66c0..c279989 100755 --- a/testssl.sh +++ b/testssl.sh @@ -17814,7 +17814,7 @@ run_tls_fallback_scsv() { pr_svrty_good "Probably OK. " fileout "$jsonID" "OK" "Probably oK" # see RFC 7507, https://github.com/drwetter/testssl.sh/issues/121 - # other case reported by Nicolas was F5 and at costumer of mine: the same + # other case reported by Nicolas was F5 and at customer of mine: the same pr_svrty_medium "But received non-RFC-compliant \"handshake failure\" instead of \"inappropriate fallback\"" fileout "$jsonID" "MEDIUM" "received non-RFC-compliant \"handshake failure\" instead of \"inappropriate fallback\"" elif grep -qa "ssl handshake failure" "$TMPFILE"; then From 39217ebe87bf4cf299099a1167471f605a1cc6bb Mon Sep 17 00:00:00 2001 From: Dirk Wetter Date: Tue, 3 Oct 2023 15:10:00 +0200 Subject: [PATCH 3/3] fix file instead of word --- .github/workflows/codespell.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 9c52024..c41d337 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -12,5 +12,5 @@ jobs: - uses: actions/checkout@v4 - uses: codespell-project/actions-codespell@master with: - skip: ca_hashes.txt,tls_data.txt,*.pem,OPENSSL-LICENSE.txt - ignore_words_list: borken,gost,ciph,ba,bloc,isnt,chello,fo,alle,anull,Widgits,Manuel + skip: ca_hashes.txt,tls_data.txt,*.pem,OPENSSL-LICENSE.txt,CREDITS.md,openssl.cnf + ignore_words_list: borken,gost,ciph,ba,bloc,isnt,chello,fo,alle,anull