merge 5.6p1

8 files changed, 299 insertions, 121 deletions

diff --git a/regress/Makefile b/regress/Makefile
index d25a64555..9762ab204 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.52 2010/02/26 20:33:21 djm Exp $
+#       $OpenBSD: Makefile,v 1.54 2010/06/27 19:19:56 phessler Exp $
 
 REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
 tests:          $(REGRESS_TARGETS)
@@ -69,7 +69,8 @@ CLEANFILES=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
                 scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \
                 sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
                 known_hosts-cert host_ca_key* cert_host_key* \
-                putty.rsa2 sshd_proxy_orig
+                putty.rsa2 sshd_proxy_orig \
+                authorized_principals_${USER}
 
 # Enable all malloc(3) randomisations and checks
 TEST_ENV=      "MALLOC_OPTIONS=AFGJPRX"
@@ -112,13 +113,13 @@ t-exec:	${LTESTS:=.sh}
         @if [ "x$?" = "x" ]; then exit 0; fi; \
         for TEST in ""$?; do \
                 echo "run test $${TEST}" ... 1>&2; \
-                (env SUDO=${SUDO} TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+                (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
         done
 
 t-exec-interop: ${INTEROP_TESTS:=.sh}
         @if [ "x$?" = "x" ]; then exit 0; fi; \
         for TEST in ""$?; do \
                 echo "run test $${TEST}" ... 1>&2; \
-                (env SUDO=${SUDO} TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+                (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
         done
 
diff --git a/regress/README.regress b/regress/README.regress
index 5aaf734bd..da9bb6a99 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -29,7 +29,7 @@ TEST_SSH_x: path to "ssh" command under test, where x=SSH,SSHD,SSHAGENT,SSHADD
 OBJ: used by test scripts to access build dir.
 TEST_SHELL: shell used for running the test scripts.
 TEST_SSH_PORT: TCP port to be used for the listening tests.
-TEST_SSH_SSH_CONFOTPS: Configuration directives to be added to ssh_config
+TEST_SSH_SSH_CONFOPTS: Configuration directives to be added to ssh_config
         before running each test.
 TEST_SSH_SSHD_CONFOTPS: Configuration directives to be added to sshd_config
         before running each test.
@@ -105,4 +105,4 @@ Known Issues.
   test to fail.  The old behaviour can be restored by setting (and
   exporting) _POSIX2_VERSION=199209 before running the tests.
 
-$Id: README.regress,v 1.10 2005/10/03 10:14:18 dtucker Exp $
+$Id: README.regress,v 1.11 2010/08/16 21:04:29 djm Exp $
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index 3fda667cb..0265e8f6b 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -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.
 
 tid="certified host keys"
@@ -28,11 +28,17 @@ for ktype in rsa dsa ; do
             -I "regress host key for $USER" \
             -n $HOSTS $OBJ/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
 
 # Basic connect tests
 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"
                 (
                         cat $OBJ/sshd_proxy_bak
@@ -61,9 +67,15 @@ done
         echon '@revoked '
         echon "* "
         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
 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"
                 (
                         cat $OBJ/sshd_proxy_bak
@@ -90,7 +102,7 @@ done
         echon "* "
         cat $OBJ/host_ca_key.pub
 ) > $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"
         (
                 cat $OBJ/sshd_proxy_bak
@@ -116,32 +128,39 @@ test_one() {
         ident=$1
         result=$2
         sign_opts=$3
-        
-        verbose "$tid: test host cert connect $ident expect $result"
-
-        ${SSHKEYGEN} -q -s $OBJ/host_ca_key -I "regress host key for $USER" \
-            $sign_opts \
-            $OBJ/cert_host_key_rsa ||
-                fail "couldn't sign cert_host_key_rsa"
-        (
-                cat $OBJ/sshd_proxy_bak
-                echo HostKey $OBJ/cert_host_key_rsa
-                echo HostCertificate $OBJ/cert_host_key_rsa-cert.pub
-        ) > $OBJ/sshd_proxy
 
-        ${SSH} -2 -oUserKnownHostsFile=$OBJ/known_hosts-cert \
-            -oGlobalKnownHostsFile=$OBJ/known_hosts-cert \
-            -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
-        rc=$?
-        if [ "x$result" = "xsuccess" ] ; then
-                if [ $rc -ne 0 ]; then
-                        fail "ssh cert connect $ident failed unexpectedly"
-                fi
-        else
-                if [ $rc -eq 0 ]; then
-                        fail "ssh cert connect $ident succeeded unexpectedly"
+        for kt in rsa rsa_v00 ; do
+                case $kt in
+                *_v00) args="-t v00" ;;
+                *) args="" ;;
+                esac
+
+                verbose "$tid: host cert connect $ident $kt expect $result"
+                ${SSHKEYGEN} -q -s $OBJ/host_ca_key \
+                    -I "regress host key for $USER" \
+                    $sign_opts $args \
+                    $OBJ/cert_host_key_${kt} ||
+                        fail "couldn't sign cert_host_key_${kt}"
+                (
+                        cat $OBJ/sshd_proxy_bak
+                        echo HostKey $OBJ/cert_host_key_${kt}
+                        echo HostCertificate $OBJ/cert_host_key_${kt}-cert.pub
+                ) > $OBJ/sshd_proxy
+        
+                ${SSH} -2 -oUserKnownHostsFile=$OBJ/known_hosts-cert \
+                    -oGlobalKnownHostsFile=$OBJ/known_hosts-cert \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                rc=$?
+                if [ "x$result" = "xsuccess" ] ; then
+                        if [ $rc -ne 0 ]; then
+                                fail "ssh cert connect $ident failed unexpectedly"
+                        fi
+                else
+                        if [ $rc -eq 0 ]; then
+                                fail "ssh cert connect $ident succeeded unexpectedly"
+                        fi
                 fi
-        fi
+        done
 }
 
 test_one "user-certificate"     failure "-n $HOSTS"
@@ -153,32 +172,35 @@ test_one "cert valid interval"	success "-h -V-1w:+2w"
 test_one "cert has constraints" failure "-h -Oforce-command=false"
 
 # Check downgrade of cert to raw key when no CA found
-rm -f $OBJ/known_hosts-cert $OBJ/cert_host_key*
-for ktype in rsa dsa ; do 
-        verbose "$tid: host ${ktype} cert downgrade to raw key"
-        # Generate and sign a host key
-        ${SSHKEYGEN} -q -N '' -t ${ktype} \
-            -f $OBJ/cert_host_key_${ktype} || \
-                fail "ssh-keygen of cert_host_key_${ktype} failed"
-        ${SSHKEYGEN} -h -q -s $OBJ/host_ca_key -I "regress host key for $USER" \
-            -n $HOSTS $OBJ/cert_host_key_${ktype} ||
-                fail "couldn't sign cert_host_key_${ktype}"
-        (
-                echon "$HOSTS "
-                cat $OBJ/cert_host_key_${ktype}.pub
-        ) > $OBJ/known_hosts-cert
-        (
-                cat $OBJ/sshd_proxy_bak
-                echo HostKey $OBJ/cert_host_key_${ktype}
-                echo HostCertificate $OBJ/cert_host_key_${ktype}-cert.pub
-        ) > $OBJ/sshd_proxy
-        
-        ${SSH} -2 -oUserKnownHostsFile=$OBJ/known_hosts-cert \
-            -oGlobalKnownHostsFile=$OBJ/known_hosts-cert \
-                -F $OBJ/ssh_proxy somehost true
-        if [ $? -ne 0 ]; then
-                fail "ssh cert connect failed"
-        fi
+for v in v01 v00 ;  do 
+        for ktype in rsa dsa ; do 
+                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
+                ${SSHKEYGEN} -q -N '' -t ${ktype} \
+                    -f $OBJ/cert_host_key_${ktype} || \
+                        fail "ssh-keygen of cert_host_key_${ktype} failed"
+                ${SSHKEYGEN} -t ${v} -h -q -s $OBJ/host_ca_key \
+                    -I "regress host key for $USER" \
+                    -n $HOSTS $OBJ/cert_host_key_${ktype} ||
+                        fail "couldn't sign cert_host_key_${ktype}"
+                (
+                        echon "$HOSTS "
+                        cat $OBJ/cert_host_key_${ktype}.pub
+                ) > $OBJ/known_hosts-cert
+                (
+                        cat $OBJ/sshd_proxy_bak
+                        echo HostKey $OBJ/cert_host_key_${ktype}
+                        echo HostCertificate $OBJ/cert_host_key_${ktype}-cert.pub
+                ) > $OBJ/sshd_proxy
+                
+                ${SSH} -2 -oUserKnownHostsFile=$OBJ/known_hosts-cert \
+                    -oGlobalKnownHostsFile=$OBJ/known_hosts-cert \
+                        -F $OBJ/ssh_proxy somehost true
+                if [ $? -ne 0 ]; then
+                        fail "ssh cert connect failed"
+                fi
+        done
 done
 
 # Wrong certificate
@@ -187,25 +209,31 @@ done
         echon "$HOSTS "
         cat $OBJ/host_ca_key.pub
 ) > $OBJ/known_hosts-cert
-for ktype in rsa dsa ; do 
-        # Self-sign key
-        ${SSHKEYGEN} -h -q -s $OBJ/cert_host_key_${ktype} \
-            -I "regress host key for $USER" \
-            -n $HOSTS $OBJ/cert_host_key_${ktype} ||
-                fail "couldn't sign cert_host_key_${ktype}"
-        verbose "$tid: host ${ktype} connect wrong cert"
-        (
-                cat $OBJ/sshd_proxy_bak
-                echo HostKey $OBJ/cert_host_key_${ktype}
-                echo HostCertificate $OBJ/cert_host_key_${ktype}-cert.pub
-        ) > $OBJ/sshd_proxy
-
-        ${SSH} -2 -oUserKnownHostsFile=$OBJ/known_hosts-cert \
-            -oGlobalKnownHostsFile=$OBJ/known_hosts-cert \
-                -F $OBJ/ssh_proxy -q somehost true >/dev/null 2>&1
-        if [ $? -eq 0 ]; then
-                fail "ssh cert connect $ident succeeded unexpectedly"
-        fi
+for v in v01 v00 ;  do 
+        for kt in rsa dsa ; do 
+                rm -f $OBJ/cert_host_key*
+                # Self-sign key
+                ${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" \
+                    -n $HOSTS $OBJ/cert_host_key_${kt} ||
+                        fail "couldn't sign cert_host_key_${kt}"
+                verbose "$tid: host ${kt} connect wrong cert"
+                (
+                        cat $OBJ/sshd_proxy_bak
+                        echo HostKey $OBJ/cert_host_key_${kt}
+                        echo HostCertificate $OBJ/cert_host_key_${kt}-cert.pub
+                ) > $OBJ/sshd_proxy
+        
+                ${SSH} -2 -oUserKnownHostsFile=$OBJ/known_hosts-cert \
+                    -oGlobalKnownHostsFile=$OBJ/known_hosts-cert \
+                        -F $OBJ/ssh_proxy -q somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect $ident succeeded unexpectedly"
+                fi
+        done
 done
 
 rm -f $OBJ/known_hosts-cert $OBJ/host_ca_key* $OBJ/cert_host_key*
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index 7a58e7b75..a41a9a9c0 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -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.6 2010/06/29 23:59:54 djm Exp $
 #       Placed in the Public Domain.
 
 tid="certified user keys"
@@ -18,8 +18,128 @@ for ktype in rsa dsa ; do
                 fail "ssh-keygen of cert_user_key_${ktype} failed"
         ${SSHKEYGEN} -q -s $OBJ/user_ca_key -I \
             "regress user key for $USER" \
-            -n $USER $OBJ/cert_user_key_${ktype} ||
+            -n ${USER},mekmitasdigoat $OBJ/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},mekmitasdigoat $OBJ/cert_user_key_${ktype}_v00 ||
+                fail "couldn't sign cert_user_key_${ktype}_v00"
+done
+
+# Test explicitly-specified principals
+for ktype in rsa dsa rsa_v00 dsa_v00 ; do 
+        for privsep in yes no ; do
+                _prefix="${ktype} privsep $privsep"
+
+                # Setup for AuthorizedPrincipalsFile
+                rm -f $OBJ/authorized_keys_$USER
+                (
+                        cat $OBJ/sshd_proxy_bak
+                        echo "UsePrivilegeSeparation $privsep"
+                        echo "AuthorizedPrincipalsFile " \
+                            "$OBJ/authorized_principals_%u"
+                        echo "TrustedUserCAKeys $OBJ/user_ca_key.pub"
+                ) > $OBJ/sshd_proxy
+
+                # Missing authorized_principals
+                verbose "$tid: ${_prefix} missing authorized_principals"
+                rm -f $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+
+                # Empty authorized_principals
+                verbose "$tid: ${_prefix} empty authorized_principals"
+                echo > $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+        
+                # Wrong authorized_principals
+                verbose "$tid: ${_prefix} wrong authorized_principals"
+                echo gregorsamsa > $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+
+                # Correct authorized_principals
+                verbose "$tid: ${_prefix} correct authorized_principals"
+                echo mekmitasdigoat > $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -ne 0 ]; then
+                        fail "ssh cert connect failed"
+                fi
+
+                # authorized_principals with bad key option
+                verbose "$tid: ${_prefix} authorized_principals bad key opt"
+                echo 'blah mekmitasdigoat' > $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+
+                # authorized_principals with command=false
+                verbose "$tid: ${_prefix} authorized_principals command=false"
+                echo 'command="false" mekmitasdigoat' > \
+                    $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+
+
+                # authorized_principals with command=true
+                verbose "$tid: ${_prefix} authorized_principals command=true"
+                echo 'command="true" mekmitasdigoat' > \
+                    $OBJ/authorized_principals_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost false >/dev/null 2>&1
+                if [ $? -ne 0 ]; then
+                        fail "ssh cert connect failed"
+                fi
+
+                # Setup for principals= key option
+                rm -f $OBJ/authorized_principals_$USER
+                (
+                        cat $OBJ/sshd_proxy_bak
+                        echo "UsePrivilegeSeparation $privsep"
+                ) > $OBJ/sshd_proxy
+
+                # Wrong principals list
+                verbose "$tid: ${_prefix} wrong principals key option"
+                (
+                        echon 'cert-authority,principals="gregorsamsa" '
+                        cat $OBJ/user_ca_key.pub
+                ) > $OBJ/authorized_keys_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                        fail "ssh cert connect succeeded unexpectedly"
+                fi
+
+                # Correct principals list
+                verbose "$tid: ${_prefix} correct principals key option"
+                (
+                        echon 'cert-authority,principals="mekmitasdigoat" '
+                        cat $OBJ/user_ca_key.pub
+                ) > $OBJ/authorized_keys_$USER
+                ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                    -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                if [ $? -ne 0 ]; then
+                        fail "ssh cert connect failed"
+                fi
+        done
 done
 
 basic_tests() {
@@ -35,7 +155,7 @@ basic_tests() {
                 extra_sshd="TrustedUserCAKeys $OBJ/user_ca_key.pub"
         fi
         
-        for ktype in rsa dsa ; do 
+        for ktype in rsa dsa rsa_v00 dsa_v00 ; do 
                 for privsep in yes no ; do
                         _prefix="${ktype} privsep $privsep $auth"
                         # Simple connect
@@ -102,45 +222,50 @@ test_one() {
         result=$2
         sign_opts=$3
         auth_choice=$4
+        auth_opt=$5
 
         if test "x$auth_choice" = "x" ; then
                 auth_choice="authorized_keys TrustedUserCAKeys"
         fi
 
         for auth in $auth_choice ; do
-                cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
-                if test "x$auth" = "xauthorized_keys" ; then
-                        # Add CA to authorized_keys
-                        (
-                                echon 'cert-authority '
-                                cat $OBJ/user_ca_key.pub
-                        ) > $OBJ/authorized_keys_$USER
-                else
-                        echo > $OBJ/authorized_keys_$USER
-                        echo "TrustedUserCAKeys $OBJ/user_ca_key.pub" >> \
-                            $OBJ/sshd_proxy
-
-                fi
-                
-                verbose "$tid: $ident auth $auth expect $result"
-                ${SSHKEYGEN} -q -s $OBJ/user_ca_key \
-                    -I "regress user key for $USER" \
-                    $sign_opts \
-                    $OBJ/cert_user_key_rsa ||
-                        fail "couldn't sign cert_user_key_rsa"
-        
-                ${SSH} -2i $OBJ/cert_user_key_rsa -F $OBJ/ssh_proxy \
-                    somehost true >/dev/null 2>&1
-                rc=$?
-                if [ "x$result" = "xsuccess" ] ; then
-                        if [ $rc -ne 0 ]; then
-                                fail "$ident failed unexpectedly"
+                for ktype in rsa rsa_v00 ; do
+                        cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
+                        if test "x$auth" = "xauthorized_keys" ; then
+                                # Add CA to authorized_keys
+                                (
+                                        echon "cert-authority${auth_opt} "
+                                        cat $OBJ/user_ca_key.pub
+                                ) > $OBJ/authorized_keys_$USER
+                        else
+                                echo > $OBJ/authorized_keys_$USER
+                                echo "TrustedUserCAKeys $OBJ/user_ca_key.pub" \
+                                    >> $OBJ/sshd_proxy
+                                if test "x$auth_opt" != "x" ; then
+                                        echo $auth_opt >> $OBJ/sshd_proxy
+                                fi
                         fi
-                else
-                        if [ $rc -eq 0 ]; then
-                                fail "$ident succeeded unexpectedly"
+                        
+                        verbose "$tid: $ident auth $auth expect $result $ktype"
+                        ${SSHKEYGEN} -q -s $OBJ/user_ca_key \
+                            -I "regress user key for $USER" \
+                            $sign_opts \
+                            $OBJ/cert_user_key_${ktype} ||
+                                fail "couldn't sign cert_user_key_${ktype}"
+
+                        ${SSH} -2i $OBJ/cert_user_key_${ktype} \
+                            -F $OBJ/ssh_proxy somehost true >/dev/null 2>&1
+                        rc=$?
+                        if [ "x$result" = "xsuccess" ] ; then
+                                if [ $rc -ne 0 ]; then
+                                        fail "$ident failed unexpectedly"
+                                fi
+                        else
+                                if [ $rc -eq 0 ]; then
+                                        fail "$ident succeeded unexpectedly"
+                                fi
                         fi
-                fi
+                done
         done
 }
 
@@ -157,10 +282,33 @@ test_one "force-command"	failure "-n ${USER} -Oforce-command=false"
 test_one "empty principals"     success "" authorized_keys
 test_one "empty principals"     failure "" TrustedUserCAKeys
 
+# Check explicitly-specified principals: an empty principals list in the cert
+# should always be refused.
+
+# AuthorizedPrincipalsFile
+rm -f $OBJ/authorized_keys_$USER
+echo mekmitasdigoat > $OBJ/authorized_principals_$USER
+test_one "AuthorizedPrincipalsFile principals" success "-n mekmitasdigoat" \
+    TrustedUserCAKeys "AuthorizedPrincipalsFile $OBJ/authorized_principals_%u"
+test_one "AuthorizedPrincipalsFile no principals" failure "" \
+    TrustedUserCAKeys "AuthorizedPrincipalsFile $OBJ/authorized_principals_%u"
+
+# principals= key option
+rm -f $OBJ/authorized_principals_$USER
+test_one "principals key option principals" success "-n mekmitasdigoat" \
+    authorized_keys ',principals="mekmitasdigoat"'
+test_one "principals key option no principals" failure "" \
+    authorized_keys ',principals="mekmitasdigoat"'
+
 # Wrong certificate
-for ktype in rsa dsa ; do 
+cat $OBJ/sshd_proxy_bak > $OBJ/sshd_proxy
+for ktype in rsa dsa rsa_v00 dsa_v00 ; do 
+        case $ktype in
+        *_v00) args="-t v00" ;;
+        *) args="" ;;
+        esac
         # 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" \
             -n $USER $OBJ/cert_user_key_${ktype} ||
                 fail "couldn't sign cert_user_key_${ktype}"
@@ -173,4 +321,5 @@ for ktype in rsa dsa ; do
 done
 
 rm -f $OBJ/authorized_keys_$USER $OBJ/user_ca_key* $OBJ/cert_user_key*
+rm -f $OBJ/authorized_principals_$USER
 
diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh
index 15a887f74..55fbb324d 100644
--- a/regress/login-timeout.sh
+++ b/regress/login-timeout.sh
@@ -15,7 +15,7 @@ if [ $? -ne 0 ]; then
         fail "ssh connect after login grace timeout failed with privsep"
 fi
 
-$SUDO kill `cat $PIDFILE`
+$SUDO kill `$SUDO cat $PIDFILE`
 
 trace "test login grace without privsep"
 echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config
diff --git a/regress/reconfigure.sh b/regress/reconfigure.sh
index 1daf29f9a..9fd289531 100644
--- a/regress/reconfigure.sh
+++ b/regress/reconfigure.sh
@@ -15,7 +15,7 @@ esac
 
 start_sshd
 
-PID=`cat $PIDFILE`
+PID=`$SUDO cat $PIDFILE`
 rm -f $PIDFILE
 $SUDO kill -HUP $PID
 
diff --git a/regress/reexec.sh b/regress/reexec.sh
index 4f824a31d..6edfc318e 100644
--- a/regress/reexec.sh
+++ b/regress/reexec.sh
@@ -41,7 +41,7 @@ echo "InvalidXXX=no" >> $OBJ/sshd_config
 
 copy_tests
 
-$SUDO kill `cat $PIDFILE`
+$SUDO kill `$SUDO cat $PIDFILE`
 rm -f $PIDFILE
 
 cp $OBJ/sshd_config.orig $OBJ/sshd_config
@@ -53,7 +53,7 @@ rm -f $SSHD_COPY
 
 copy_tests
 
-$SUDO kill `cat $PIDFILE`
+$SUDO kill `$SUDO cat $PIDFILE`
 rm -f $PIDFILE
 
 verbose "test reexec fallback without privsep"
@@ -66,7 +66,7 @@ rm -f $SSHD_COPY
 
 copy_tests
 
-$SUDO kill `cat $PIDFILE`
+$SUDO kill `$SUDO cat $PIDFILE`
 rm -f $PIDFILE
 
 
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index b3a19389d..b64dcdbcf 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -167,7 +167,7 @@ have_prog()
 cleanup ()
 {
         if [ -f $PIDFILE ]; then
-                pid=`cat $PIDFILE`
+                pid=`$SUDO cat $PIDFILE`
                 if [ "X$pid" = "X" ]; then
                         echo no sshd running
                 else