19261079b7
Some notable changes, from upstream's release notes: - sshd(8): Remove support for obsolete "host/port" syntax. - ssh(1): When prompting whether to record a new host key, accept the key fingerprint as a synonym for "yes". - ssh-keygen(1): when acting as a CA and signing certificates with an RSA key, default to using the rsa-sha2-512 signature algorithm. - ssh(1), sshd(8), ssh-keygen(1): this release removes the "ssh-rsa" (RSA/SHA1) algorithm from those accepted for certificate signatures. - ssh-sk-helper(8): this is a new binary. It is used by the FIDO/U2F support to provide address-space isolation for token middleware libraries (including the internal one). - ssh(1): this release enables UpdateHostkeys by default subject to some conservative preconditions. - scp(1): this release changes the behaviour of remote to remote copies (e.g. "scp host-a:/path host-b:") to transfer through the local host by default. - scp(1): experimental support for transfers using the SFTP protocol as a replacement for the venerable SCP/RCP protocol that it has traditionally used. Additional integration work is needed to support FIDO/U2F in the base system. Deprecation Notice ------------------ OpenSSH will disable the ssh-rsa signature scheme by default in the next release. Reviewed by: imp MFC after: 1 month Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D29985
237 lines
8.4 KiB
Bash
237 lines
8.4 KiB
Bash
# $OpenBSD: sshsig.sh,v 1.7 2021/08/11 08:55:04 djm Exp $
|
|
# Placed in the Public Domain.
|
|
|
|
tid="sshsig"
|
|
|
|
DATA2=$OBJ/${DATANAME}.2
|
|
cat ${DATA} ${DATA} > ${DATA2}
|
|
|
|
rm -f $OBJ/sshsig-*.sig $OBJ/wrong-key* $OBJ/sigca-key*
|
|
|
|
sig_namespace="test-$$"
|
|
sig_principal="user-$$@example.com"
|
|
|
|
# Make a "wrong key"
|
|
${SSHKEYGEN} -q -t ed25519 -f $OBJ/wrong-key \
|
|
-C "wrong trousers, Grommit" -N '' \
|
|
|| fatal "couldn't generate key"
|
|
WRONG=$OBJ/wrong-key.pub
|
|
|
|
# Make a CA key.
|
|
${SSHKEYGEN} -q -t ed25519 -f $OBJ/sigca-key -C "CA" -N '' \
|
|
|| fatal "couldn't generate key"
|
|
CA_PRIV=$OBJ/sigca-key
|
|
CA_PUB=$OBJ/sigca-key.pub
|
|
|
|
trace "start agent"
|
|
eval `${SSHAGENT} ${EXTRA_AGENT_ARGS} -s` > /dev/null
|
|
r=$?
|
|
if [ $r -ne 0 ]; then
|
|
fatal "could not start ssh-agent: exit code $r"
|
|
fi
|
|
|
|
SIGNKEYS="$SSH_KEYTYPES"
|
|
verbose "$tid: make certificates"
|
|
for t in $SSH_KEYTYPES ; do
|
|
${SSHKEYGEN} -q -s $CA_PRIV -z $$ \
|
|
-I "regress signature key for $USER" \
|
|
-n $sig_principal $OBJ/${t} || \
|
|
fatal "couldn't sign ${t}"
|
|
SIGNKEYS="$SIGNKEYS ${t}-cert.pub"
|
|
done
|
|
|
|
for t in $SIGNKEYS; do
|
|
verbose "$tid: check signature for $t"
|
|
keybase=`basename $t .pub`
|
|
privkey=${OBJ}/`basename $t -cert.pub`
|
|
sigfile=${OBJ}/sshsig-${keybase}.sig
|
|
sigfile_agent=${OBJ}/sshsig-agent-${keybase}.sig
|
|
pubkey=${OBJ}/${keybase}.pub
|
|
|
|
${SSHKEYGEN} -vvv -Y sign -f ${OBJ}/$t -n $sig_namespace \
|
|
< $DATA > $sigfile 2>/dev/null || fail "sign using $t failed"
|
|
|
|
(printf "$sig_principal " ; cat $pubkey) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 || \
|
|
fail "failed signature for $t key"
|
|
|
|
(printf "$sig_principal namespaces=\"$sig_namespace,whatever\" ";
|
|
cat $pubkey) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $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 \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "accepted signature for $t key with bad signers option"
|
|
|
|
# Wrong key trusted.
|
|
(printf "$sig_principal " ; cat $WRONG) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "accepted signature for $t key with wrong key trusted"
|
|
|
|
# incorrect data
|
|
(printf "$sig_principal " ; cat $pubkey) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA2 >/dev/null 2>&1 && \
|
|
fail "passed signature for wrong data with $t key"
|
|
|
|
# wrong principal in signers
|
|
(printf "josef.k@example.com " ; cat $pubkey) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "accepted signature for $t key with wrong principal"
|
|
|
|
# wrong namespace
|
|
(printf "$sig_principal " ; cat $pubkey) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n COWS_COWS_COWS \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "accepted signature for $t key with wrong namespace"
|
|
|
|
# namespace excluded by option
|
|
(printf "$sig_principal namespaces=\"whatever\" " ;
|
|
cat $pubkey) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "accepted signature for $t key with excluded namespace"
|
|
|
|
( printf "$sig_principal " ;
|
|
printf "valid-after=\"19800101\",valid-before=\"19900101\" " ;
|
|
cat $pubkey) > $OBJ/allowed_signers
|
|
|
|
# key lifespan valid
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
-Overify-time=19850101 \
|
|
< $DATA >/dev/null 2>&1 || \
|
|
fail "failed signature for $t key with valid expiry interval"
|
|
# key not yet valid
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
-Overify-time=19790101 \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "failed signature for $t not-yet-valid key"
|
|
# key expired
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
-Overify-time=19910101 \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "failed signature for $t with expired key"
|
|
# NB. assumes we're not running this test in the 1980s
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "failed signature for $t with expired key"
|
|
|
|
# public key in revoked keys file
|
|
cat $pubkey > $OBJ/revoked_keys
|
|
(printf "$sig_principal namespaces=\"whatever\" " ;
|
|
cat $pubkey) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
-r $OBJ/revoked_keys \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "accepted signature for $t key, but key is in revoked_keys"
|
|
|
|
# public key not revoked, but others are present in revoked_keysfile
|
|
cat $WRONG > $OBJ/revoked_keys
|
|
(printf "$sig_principal " ; cat $pubkey) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
-r $OBJ/revoked_keys \
|
|
< $DATA >/dev/null 2>&1 || \
|
|
fail "couldn't verify signature for $t key, but key not in revoked_keys"
|
|
|
|
# check-novalidate with valid data
|
|
${SSHKEYGEN} -vvv -Y check-novalidate -s $sigfile -n $sig_namespace \
|
|
< $DATA >/dev/null 2>&1 || \
|
|
fail "failed to check valid signature for $t key"
|
|
|
|
# check-novalidate with invalid data
|
|
${SSHKEYGEN} -vvv -Y check-novalidate -s $sigfile -n $sig_namespace \
|
|
< $DATA2 >/dev/null 2>&1 && \
|
|
fail "succeeded checking signature for $t key with invalid data"
|
|
|
|
# Check signing keys using ssh-agent.
|
|
${SSHADD} -D >/dev/null 2>&1 # Remove all previously-loaded keys.
|
|
${SSHADD} ${privkey} > /dev/null 2>&1 || fail "ssh-add failed"
|
|
|
|
# Move private key to ensure agent key is used
|
|
mv ${privkey} ${privkey}.tmp
|
|
|
|
${SSHKEYGEN} -vvv -Y sign -f $pubkey -n $sig_namespace \
|
|
< $DATA > $sigfile_agent 2>/dev/null || \
|
|
fail "ssh-agent based sign using $pubkey failed"
|
|
${SSHKEYGEN} -vvv -Y check-novalidate -s $sigfile_agent \
|
|
-n $sig_namespace < $DATA >/dev/null 2>&1 || \
|
|
fail "failed to check valid signature for $t key"
|
|
|
|
# Move private key back
|
|
mv ${privkey}.tmp ${privkey}
|
|
|
|
# Remaining tests are for certificates only.
|
|
case "$keybase" in
|
|
*-cert) ;;
|
|
*) continue ;;
|
|
esac
|
|
|
|
|
|
# correct CA key
|
|
(printf "$sig_principal cert-authority " ;
|
|
cat $CA_PUB) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 || \
|
|
fail "failed signature for $t cert"
|
|
|
|
# signing key listed as cert-authority
|
|
(printf "$sig_principal cert-authority " ;
|
|
cat $pubkey) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "accepted signature with $t key listed as CA"
|
|
|
|
# CA key not flagged cert-authority
|
|
(printf "$sig_principal " ; cat $CA_PUB) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "accepted signature for $t cert with CA not marked"
|
|
|
|
# mismatch between cert principal and file
|
|
(printf "josef.k@example.com cert-authority " ;
|
|
cat $CA_PUB) > $OBJ/allowed_signers
|
|
${SSHKEYGEN} -vvv -Y verify -s $sigfile -n $sig_namespace \
|
|
-I $sig_principal -f $OBJ/allowed_signers \
|
|
< $DATA >/dev/null 2>&1 && \
|
|
fail "accepted signature for $t cert with wrong principal"
|
|
done
|
|
|
|
trace "kill agent"
|
|
${SSHAGENT} -k > /dev/null
|
|
|