]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: test -Oprint-pubkey
authordjm@openbsd.org <djm@openbsd.org>
Wed, 11 Aug 2021 08:55:04 +0000 (08:55 +0000)
committerDamien Miller <djm@mindrot.org>
Wed, 11 Aug 2021 08:56:35 +0000 (18:56 +1000)
OpenBSD-Regress-ID: 3d51afb6d1f287975fb6fddd7a2c00a3bc5094e0

regress/sshsig.sh

index 296013617e38b54943a089a71bcdcde37ddae7fe..fc300a8dc3ed3d6f7f0c8c79cce4ebb81d074a98 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: sshsig.sh,v 1.6 2021/07/23 03:54:55 djm Exp $
+#      $OpenBSD: sshsig.sh,v 1.7 2021/08/11 08:55:04 djm Exp $
 #      Placed in the Public Domain.
 
 tid="sshsig"
@@ -64,6 +64,17 @@ for t in $SIGNKEYS; do
                < $DATA >/dev/null 2>&1 || \
                fail "failed signature for $t key w/ limited namespace"
 
+       (printf "$sig_principal namespaces=\"$sig_namespace,whatever\" ";
+        cat $pubkey) > $OBJ/allowed_signers
+       ${SSHKEYGEN} -q -Y verify -s $sigfile -n $sig_namespace \
+               -I $sig_principal -f $OBJ/allowed_signers \
+               -O print-pubkey \
+               < $DATA | cut -d' ' -f1-2 > ${OBJ}/${keybase}-fromsig.pub || \
+               fail "failed signature for $t key w/ print-pubkey"
+       cut -d' ' -f1-2 ${OBJ}/${keybase}.pub > ${OBJ}/${keybase}-strip.pub
+       diff -r ${OBJ}/${keybase}-strip.pub ${OBJ}/${keybase}-fromsig.pub || \
+               fail "print-pubkey differs from signature key"
+
        # Invalid option
        (printf "$sig_principal octopus " ; cat $pubkey) > $OBJ/allowed_signers
        ${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \