Skip to content

Commit fe319d5

Browse files
gitstergitster
committed
Merge branch 'jk/ssh-signing-fix'
Reject OpenSSH 8.7 whose "ssh-keygen -Y find-principals" is unusable from running the ssh signature tests. * jk/ssh-signing-fix: t/lib-gpg: avoid broken versions of ssh-keygen
2 parents aace36f + ca7a5bf commit fe319d5

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

‎t/lib-gpg.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ test_lazy_prereq GPGSSH '
104104
test $? != 127 || exit 1
105105
echo $ssh_version | grep -q "find-principals:missing signature file"
106106
test $? = 0 || exit 1;
107+
108+
# some broken versions of ssh-keygen segfault on find-principals;
109+
# avoid testing with them.
110+
ssh-keygen -Y find-principals -f /dev/null -s /dev/null
111+
test $? = 139 && exit 1
112+
107113
mkdir -p "${GNUPGHOME}" &&
108114
chmod 0700 "${GNUPGHOME}" &&
109115
(setfacl -k "${GNUPGHOME}" 2>/dev/null || true) &&

0 commit comments

Comments
 (0)