From: Todd Zullinger <tmz@pobox.com>
To: git@vger.kernel.org
Cc: Fabian Stelzer <fs@gigacodes.de>
Subject: [PATCH] t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0
Date: Wed, 24 May 2023 23:10:24 -0400 [thread overview]
Message-ID: <20230525031026.3554406-1-tmz@pobox.com> (raw)
OpenSSH-9.0 requires a namespace option with `-Y check-novalidate`.
This was added in openssh-portable commit a0b5816f8 (upstream:
ssh-keygen -Y check-novalidate requires namespace or SEGV, 2022-03-18).
The -n option was documented as a required option since check-novalidate
was added in openssh-portable 8aa2aa3cd (upstream: Allow testing
signature syntax and validity without verifying, 2019-09-16).
Signed-off-by: Todd Zullinger <tmz@pobox.com>
---
Hi,
I only recently noticed the GPGSSH_VERIFYTIME prereq had
been failing in the Fedora builds. This began when openssh
was updated to 9.0 in the distribution, which means I've
been slack on checking missing prereqs since last August. :/
Initially, I thought it was another issue, where the final
ssh-keygen call in the prereq lacked a message on stdin,
which caused it to hang.
That only occurs when running the contents of the prereq
manually, so it may not be worth touching. But if that
seems worthwhile -- if only to avoid anyone else getting
spending time debugging the wrong problem -- I can send the
patch I had prepared which does:
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 114785586a..2815df8503 100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -165,7 +165,7 @@ test_lazy_prereq GPGSSH_VERIFYTIME '
# and verify ssh-keygen verifies the key lifetime
echo "testpayload" |
ssh-keygen -Y sign -n "git" -f "${GPGSSH_KEY_EXPIRED}" >gpgssh_verifytime_prereq.sig &&
- ! (ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with expired key" -s gpgssh_verifytime_prereq.sig)
+ ! (echo "testpayload" | ssh-keygen -Y verify -n "git" -f "${GPGSSH_ALLOWED_SIGNERS}" -I "principal with expired key" -s gpgssh_verifytime_prereq.sig)
'
sanitize_pgp() {
t/lib-gpg.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 114785586a..28652ed91f 100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -136,7 +136,7 @@ test_lazy_prereq GPGSSH '
test_lazy_prereq GPGSSH_VERIFYTIME '
# Check if ssh-keygen has a verify-time option by passing an invalid date to it
- ssh-keygen -Overify-time=INVALID -Y check-novalidate -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
+ ssh-keygen -Overify-time=INVALID -Y check-novalidate -n "git" -s doesnotmatter 2>&1 | grep -q -F "Invalid \"verify-time\"" &&
# Set up keys with key lifetimes
ssh-keygen -t ed25519 -N "" -C "timeboxed valid key" -f "${GPGSSH_KEY_TIMEBOXEDVALID}" >/dev/null &&
--
2.41.0.rc2
next reply other threads:[~2023-05-25 3:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-25 3:10 Todd Zullinger [this message]
2023-05-26 4:52 ` [PATCH] t/lib-gpg: fix ssh-keygen -Y check-novalidate with openssh-9.0 Junio C Hamano
2023-05-26 5:28 ` Todd Zullinger
2023-06-01 4:46 ` Junio C Hamano
2023-06-06 21:47 ` [PATCH] t/lib-gpg: require GPGSSH for GPGSSH_VERIFYTIME prereq Todd Zullinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230525031026.3554406-1-tmz@pobox.com \
--to=tmz@pobox.com \
--cc=fs@gigacodes.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).