tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- OpenBSD CVS Sync 

- djm@cvs.openbsd.org 2010/04/16 01:58:45
     [regress/cert-hostkey.sh regress/cert-userkey.sh]
     regression tests for v01 certificate format
     includes interop tests for v00 certs
This commit is contained in:
Damien Miller 2010-04-18 08:15:14 +10:00
parent c617aa9ff5
commit 53f4bb6599
3 changed files with 151 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -9,6 +9,10 @@
- djm@cvs.openbsd.org 2010/04/16 21:14:27 - djm@cvs.openbsd.org 2010/04/16 21:14:27
[sshconnect.c] [sshconnect.c]
oops, %r => remote username, not %u oops, %r => remote username, not %u
- djm@cvs.openbsd.org 2010/04/16 01:58:45
[regress/cert-hostkey.sh regress/cert-userkey.sh]
regression tests for v01 certificate format
includes interop tests for v00 certs
20100416 20100416
- (djm) Release openssh-5.5p1 - (djm) Release openssh-5.5p1

70
regress/cert-hostkey.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: cert-hostkey.sh,v 1.3 2010/03/04 10:38:23 djm Exp $ # $OpenBSD: cert-hostkey.sh,v 1.4 2010/04/16 01:58:45 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="certified host keys" tid="certified host keys"
@ -28,11 +28,17 @@ for ktype in rsa dsa ; do
-I "regress host key for $USER" \ -I "regress host key for $USER" \
-n $HOSTS $OBJ/cert_host_key_${ktype} || -n $HOSTS $OBJ/cert_host_key_${ktype} ||
fail "couldn't sign cert_host_key_${ktype}" fail "couldn't sign cert_host_key_${ktype}"
cp $OBJ/cert_host_key_${ktype} $OBJ/cert_host_key_${ktype}_v00
cp $OBJ/cert_host_key_${ktype}.pub $OBJ/cert_host_key_${ktype}_v00.pub
${SSHKEYGEN} -t v00 -h -q -s $OBJ/host_ca_key \
-I "regress host key for $USER" \
-n $HOSTS $OBJ/cert_host_key_${ktype}_v00 ||
fail "couldn't sign cert_host_key_${ktype}_v00"
done done
# Basic connect tests # Basic connect tests
for privsep in yes no ; do for privsep in yes no ; do
for ktype in rsa dsa ; do for ktype in rsa dsa rsa_v00 dsa_v00; do
verbose "$tid: host ${ktype} cert connect privsep $privsep" verbose "$tid: host ${ktype} cert connect privsep $privsep"
( (
cat $OBJ/sshd_proxy_bak cat $OBJ/sshd_proxy_bak
@ -61,9 +67,15 @@ done
echon '@revoked ' echon '@revoked '
echon "* " echon "* "
cat $OBJ/cert_host_key_dsa.pub cat $OBJ/cert_host_key_dsa.pub
echon '@revoked '
echon "* "
cat $OBJ/cert_host_key_rsa_v00.pub
echon '@revoked '
echon "* "
cat $OBJ/cert_host_key_dsa_v00.pub
) > $OBJ/known_hosts-cert ) > $OBJ/known_hosts-cert
for privsep in yes no ; do for privsep in yes no ; do
for ktype in rsa dsa ; do for ktype in rsa dsa rsa_v00 dsa_v00; do
verbose "$tid: host ${ktype} revoked cert privsep $privsep" verbose "$tid: host ${ktype} revoked cert privsep $privsep"
( (
cat $OBJ/sshd_proxy_bak cat $OBJ/sshd_proxy_bak
@ -90,7 +102,7 @@ done
echon "* " echon "* "
cat $OBJ/host_ca_key.pub cat $OBJ/host_ca_key.pub
) > $OBJ/known_hosts-cert ) > $OBJ/known_hosts-cert
for ktype in rsa dsa ; do for ktype in rsa dsa rsa_v00 dsa_v00 ; do
verbose "$tid: host ${ktype} revoked cert" verbose "$tid: host ${ktype} revoked cert"
( (
cat $OBJ/sshd_proxy_bak cat $OBJ/sshd_proxy_bak
@ -117,16 +129,22 @@ test_one() {
result=$2 result=$2
sign_opts=$3 sign_opts=$3
verbose "$tid: test host cert connect $ident expect $result" for kt in rsa rsa_v00 ; do
case $kt in
*_v00) args="-t v00" ;;
*) args="" ;;
esac
${SSHKEYGEN} -q -s $OBJ/host_ca_key -I "regress host key for $USER" \ verbose "$tid: host cert connect $ident $kt expect $result"
$sign_opts \ ${SSHKEYGEN} -q -s $OBJ/host_ca_key \
$OBJ/cert_host_key_rsa || -I "regress host key for $USER" \
fail "couldn't sign cert_host_key_rsa" $sign_opts $args \
$OBJ/cert_host_key_${kt} ||
fail "couldn't sign cert_host_key_${kt}"
( (
cat $OBJ/sshd_proxy_bak cat $OBJ/sshd_proxy_bak
echo HostKey $OBJ/cert_host_key_rsa echo HostKey $OBJ/cert_host_key_${kt}
echo HostCertificate $OBJ/cert_host_key_rsa-cert.pub echo HostCertificate $OBJ/cert_host_key_${kt}-cert.pub
) > $OBJ/sshd_proxy ) > $OBJ/sshd_proxy
${SSH} -2 -oUserKnownHostsFile=$OBJ/known_hosts-cert \ ${SSH} -2 -oUserKnownHostsFile=$OBJ/known_hosts-cert \
@ -142,6 +160,7 @@ test_one() {
fail "ssh cert connect $ident succeeded unexpectedly" fail "ssh cert connect $ident succeeded unexpectedly"
fi fi
fi fi
done
} }
test_one "user-certificate" failure "-n $HOSTS" test_one "user-certificate" failure "-n $HOSTS"
@ -153,14 +172,16 @@ test_one "cert valid interval" success "-h -V-1w:+2w"
test_one "cert has constraints" failure "-h -Oforce-command=false" test_one "cert has constraints" failure "-h -Oforce-command=false"
# Check downgrade of cert to raw key when no CA found # Check downgrade of cert to raw key when no CA found
rm -f $OBJ/known_hosts-cert $OBJ/cert_host_key* for v in v01 v00 ; do
for ktype in rsa dsa ; do for ktype in rsa dsa ; do
verbose "$tid: host ${ktype} cert downgrade to raw key" rm -f $OBJ/known_hosts-cert $OBJ/cert_host_key*
verbose "$tid: host ${ktype} ${v} cert downgrade to raw key"
# Generate and sign a host key # Generate and sign a host key
${SSHKEYGEN} -q -N '' -t ${ktype} \ ${SSHKEYGEN} -q -N '' -t ${ktype} \
-f $OBJ/cert_host_key_${ktype} || \ -f $OBJ/cert_host_key_${ktype} || \
fail "ssh-keygen of cert_host_key_${ktype} failed" fail "ssh-keygen of cert_host_key_${ktype} failed"
${SSHKEYGEN} -h -q -s $OBJ/host_ca_key -I "regress host key for $USER" \ ${SSHKEYGEN} -t ${v} -h -q -s $OBJ/host_ca_key \
-I "regress host key for $USER" \
-n $HOSTS $OBJ/cert_host_key_${ktype} || -n $HOSTS $OBJ/cert_host_key_${ktype} ||
fail "couldn't sign cert_host_key_${ktype}" fail "couldn't sign cert_host_key_${ktype}"
( (
@ -180,6 +201,7 @@ for ktype in rsa dsa ; do
fail "ssh cert connect failed" fail "ssh cert connect failed"
fi fi
done done
done
# Wrong certificate # Wrong certificate
( (
@ -187,17 +209,22 @@ done
echon "$HOSTS " echon "$HOSTS "
cat $OBJ/host_ca_key.pub cat $OBJ/host_ca_key.pub
) > $OBJ/known_hosts-cert ) > $OBJ/known_hosts-cert
for ktype in rsa dsa ; do for v in v01 v00 ; do
for kt in rsa dsa ; do
rm -f $OBJ/cert_host_key*
# Self-sign key # Self-sign key
${SSHKEYGEN} -h -q -s $OBJ/cert_host_key_${ktype} \ ${SSHKEYGEN} -q -N '' -t ${kt} \
-f $OBJ/cert_host_key_${kt} || \
fail "ssh-keygen of cert_host_key_${kt} failed"
${SSHKEYGEN} -t ${v} -h -q -s $OBJ/cert_host_key_${kt} \
-I "regress host key for $USER" \ -I "regress host key for $USER" \
-n $HOSTS $OBJ/cert_host_key_${ktype} || -n $HOSTS $OBJ/cert_host_key_${kt} ||
fail "couldn't sign cert_host_key_${ktype}" fail "couldn't sign cert_host_key_${kt}"
verbose "$tid: host ${ktype} connect wrong cert" verbose "$tid: host ${kt} connect wrong cert"
( (
cat $OBJ/sshd_proxy_bak cat $OBJ/sshd_proxy_bak
echo HostKey $OBJ/cert_host_key_${ktype} echo HostKey $OBJ/cert_host_key_${kt}
echo HostCertificate $OBJ/cert_host_key_${ktype}-cert.pub echo HostCertificate $OBJ/cert_host_key_${kt}-cert.pub
) > $OBJ/sshd_proxy ) > $OBJ/sshd_proxy
${SSH} -2 -oUserKnownHostsFile=$OBJ/known_hosts-cert \ ${SSH} -2 -oUserKnownHostsFile=$OBJ/known_hosts-cert \
@ -207,5 +234,6 @@ for ktype in rsa dsa ; do
fail "ssh cert connect $ident succeeded unexpectedly" fail "ssh cert connect $ident succeeded unexpectedly"
fi fi
done done
done
rm -f $OBJ/known_hosts-cert $OBJ/host_ca_key* $OBJ/cert_host_key* rm -f $OBJ/known_hosts-cert $OBJ/host_ca_key* $OBJ/cert_host_key*

34
regress/cert-userkey.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: cert-userkey.sh,v 1.3 2010/03/04 10:38:23 djm Exp $ # $OpenBSD: cert-userkey.sh,v 1.4 2010/04/16 01:58:45 djm Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="certified user keys" tid="certified user keys"
@ -20,6 +20,12 @@ for ktype in rsa dsa ; do
"regress user key for $USER" \ "regress user key for $USER" \
-n $USER $OBJ/cert_user_key_${ktype} || -n $USER $OBJ/cert_user_key_${ktype} ||
fail "couldn't sign cert_user_key_${ktype}" fail "couldn't sign cert_user_key_${ktype}"
cp $OBJ/cert_user_key_${ktype} $OBJ/cert_user_key_${ktype}_v00
cp $OBJ/cert_user_key_${ktype}.pub $OBJ/cert_user_key_${ktype}_v00.pub
${SSHKEYGEN} -q -t v00 -s $OBJ/user_ca_key -I \
"regress user key for $USER" \
-n $USER $OBJ/cert_user_key_${ktype}_v00 ||
fail "couldn't sign cert_user_key_${ktype}_v00"
done done
basic_tests() { basic_tests() {
@ -35,7 +41,7 @@ basic_tests() {
extra_sshd="TrustedUserCAKeys $OBJ/user_ca_key.pub" extra_sshd="TrustedUserCAKeys $OBJ/user_ca_key.pub"
fi fi
for ktype in rsa dsa ; do for ktype in rsa dsa rsa_v00 dsa_v00 ; do
for privsep in yes no ; do for privsep in yes no ; do
_prefix="${ktype} privsep $privsep $auth" _prefix="${ktype} privsep $privsep $auth"
# Simple connect # Simple connect
@ -108,6 +114,7 @@ test_one() {
fi fi
for auth in $auth_choice ; do for auth in $auth_choice ; do
for ktype in rsa rsa_v00 ; do
cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
if test "x$auth" = "xauthorized_keys" ; then if test "x$auth" = "xauthorized_keys" ; then
# Add CA to authorized_keys # Add CA to authorized_keys
@ -117,20 +124,20 @@ test_one() {
) > $OBJ/authorized_keys_$USER ) > $OBJ/authorized_keys_$USER
else else
echo > $OBJ/authorized_keys_$USER echo > $OBJ/authorized_keys_$USER
echo "TrustedUserCAKeys $OBJ/user_ca_key.pub" >> \ echo "TrustedUserCAKeys $OBJ/user_ca_key.pub" \
$OBJ/sshd_proxy >> $OBJ/sshd_proxy
fi fi
verbose "$tid: $ident auth $auth expect $result" verbose "$tid: $ident auth $auth expect $result $ktype"
${SSHKEYGEN} -q -s $OBJ/user_ca_key \ ${SSHKEYGEN} -q -s $OBJ/user_ca_key \
-I "regress user key for $USER" \ -I "regress user key for $USER" \
$sign_opts \ $sign_opts \
$OBJ/cert_user_key_rsa || $OBJ/cert_user_key_${ktype} ||
fail "couldn't sign cert_user_key_rsa" fail "couldn't sign cert_user_key_${ktype}"
${SSH} -2i $OBJ/cert_user_key_rsa -F $OBJ/ssh_proxy \ ${SSH} -2i $OBJ/cert_user_key_${ktype} \
somehost true >/dev/null 2>&1 -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
rc=$? rc=$?
if [ "x$result" = "xsuccess" ] ; then if [ "x$result" = "xsuccess" ] ; then
if [ $rc -ne 0 ]; then if [ $rc -ne 0 ]; then
@ -142,6 +149,7 @@ test_one() {
fi fi
fi fi
done done
done
} }
test_one "correct principal" success "-n ${USER}" test_one "correct principal" success "-n ${USER}"
@ -158,9 +166,13 @@ test_one "empty principals" success "" authorized_keys
test_one "empty principals" failure "" TrustedUserCAKeys test_one "empty principals" failure "" TrustedUserCAKeys
# Wrong certificate # Wrong certificate
for ktype in rsa dsa ; do for ktype in rsa dsa rsa_v00 dsa_v00 ; do
case $ktype in
*_v00) args="-t v00" ;;
*) args="" ;;
esac
# Self-sign # Self-sign
${SSHKEYGEN} -q -s $OBJ/cert_user_key_${ktype} -I \ ${SSHKEYGEN} $args -q -s $OBJ/cert_user_key_${ktype} -I \
"regress user key for $USER" \ "regress user key for $USER" \
-n $USER $OBJ/cert_user_key_${ktype} || -n $USER $OBJ/cert_user_key_${ktype} ||
fail "couldn't sign cert_user_key_${ktype}" fail "couldn't sign cert_user_key_${ktype}"