quote regexes used to test for algorithm support

Fixes test failures on Solaris 8 reported by Tom G. Christensen

diff --git a/regress/Makefile b/regress/Makefile
index 8628ddd28c739106c653f36d623f90705f39f823..c9a495f6f4cc929457405f8e39ddc12c928dc0f8 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -156,7 +156,7 @@ TEST_SSH_SSHKEYGEN?=ssh-keygen
 CPPFLAGS=-I..
 
 t1:
-       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-rsa ; then \
+       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-rsa" ; then \
                ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv ; \
                tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv ; \
                ${TEST_SSH_SSHKEYGEN} -if ${.OBJDIR}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv ; \
@@ -165,31 +165,31 @@ t1:
        fi
 
 t2:
-       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-rsa ; then \
+       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-rsa" ; then \
                cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out ; \
                chmod 600 $(OBJ)/t2.out ; \
                ${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub ; \
        fi
 
 t3:
-       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-rsa ; then \
+       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-rsa" ; then \
                ${TEST_SSH_SSHKEYGEN} -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/t3.out ; \
                ${TEST_SSH_SSHKEYGEN} -if $(OBJ)/t3.out | diff - ${.CURDIR}/rsa_openssh.pub ; \
        fi
 
 t4:
-       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-rsa ; then \
+       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-rsa" ; then \
                ${TEST_SSH_SSHKEYGEN} -E md5 -lf ${.CURDIR}/rsa_openssh.pub |\
                        awk '{print $$2}' | diff - ${.CURDIR}/t4.ok ; \
        fi
 
 t5:
-       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-rsa ; then \
+       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-rsa" ; then \
                ${TEST_SSH_SSHKEYGEN} -Bf ${.CURDIR}/rsa_openssh.pub |\
                        awk '{print $$2}' | diff - ${.CURDIR}/t5.ok ; \
        fi
 t6:
-       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-dss ; then \
+       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-dss" ; then \
                ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1 ; \
                ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2 ; \
                chmod 600 $(OBJ)/t6.out1 ; \
@@ -197,23 +197,23 @@ t6:
        fi
 
 $(OBJ)/t7.out:
-       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-dss ; then \
+       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-dss" ; then \
                ${TEST_SSH_SSHKEYGEN} -q -t rsa -N '' -f $@ ; \
        fi
 
 t7: $(OBJ)/t7.out
-       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-dss ; then \
+       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-dss" ; then \
                ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t7.out > /dev/null ; \
                ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t7.out > /dev/null ; \
        fi
 
 $(OBJ)/t8.out:
-       set -xe ; if ssh -Q key | grep -q ^ssh-dss ; then \
+       set -xe ; if ssh -Q key | grep -q "^ssh-dss" ; then \
                ${TEST_SSH_SSHKEYGEN} -q -t dsa -N '' -f $@ ; \
        fi
 
 t8: $(OBJ)/t8.out
-       set -xe ; if ssh -Q key | grep -q ^ssh-dss ; then \
+       set -xe ; if ssh -Q key | grep -q "^ssh-dss" ; then \
                ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t8.out > /dev/null ; \
                ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t8.out > /dev/null ; \
        fi
@@ -237,7 +237,7 @@ t10: $(OBJ)/t10.out
        ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t10.out > /dev/null
 
 t11:
-       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-dss ; then \
+       set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-dss" ; then \
                ${TEST_SSH_SSHKEYGEN} -E sha256 -lf ${.CURDIR}/rsa_openssh.pub |\
                        awk '{print $$2}' | diff - ${.CURDIR}/t11.ok ; \
        fi