Skip to content

Commit 26b09b4

Browse files
committed
quote regexes used to test for algorithm support
Fixes test failures on Solaris 8 reported by Tom G. Christensen
1 parent a6a740a commit 26b09b4

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

regress/Makefile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ TEST_SSH_SSHKEYGEN?=ssh-keygen
156156
CPPFLAGS=-I..
157157

158158
t1:
159-
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-rsa ; then \
159+
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-rsa" ; then \
160160
${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv ; \
161161
tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv ; \
162162
${TEST_SSH_SSHKEYGEN} -if ${.OBJDIR}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv ; \
@@ -165,55 +165,55 @@ t1:
165165
fi
166166

167167
t2:
168-
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-rsa ; then \
168+
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-rsa" ; then \
169169
cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out ; \
170170
chmod 600 $(OBJ)/t2.out ; \
171171
${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub ; \
172172
fi
173173

174174
t3:
175-
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-rsa ; then \
175+
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-rsa" ; then \
176176
${TEST_SSH_SSHKEYGEN} -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/t3.out ; \
177177
${TEST_SSH_SSHKEYGEN} -if $(OBJ)/t3.out | diff - ${.CURDIR}/rsa_openssh.pub ; \
178178
fi
179179

180180
t4:
181-
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-rsa ; then \
181+
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-rsa" ; then \
182182
${TEST_SSH_SSHKEYGEN} -E md5 -lf ${.CURDIR}/rsa_openssh.pub |\
183183
awk '{print $$2}' | diff - ${.CURDIR}/t4.ok ; \
184184
fi
185185

186186
t5:
187-
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-rsa ; then \
187+
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-rsa" ; then \
188188
${TEST_SSH_SSHKEYGEN} -Bf ${.CURDIR}/rsa_openssh.pub |\
189189
awk '{print $$2}' | diff - ${.CURDIR}/t5.ok ; \
190190
fi
191191
t6:
192-
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-dss ; then \
192+
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-dss" ; then \
193193
${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1 ; \
194194
${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2 ; \
195195
chmod 600 $(OBJ)/t6.out1 ; \
196196
${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2 ; \
197197
fi
198198

199199
$(OBJ)/t7.out:
200-
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-dss ; then \
200+
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-dss" ; then \
201201
${TEST_SSH_SSHKEYGEN} -q -t rsa -N '' -f $@ ; \
202202
fi
203203

204204
t7: $(OBJ)/t7.out
205-
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-dss ; then \
205+
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-dss" ; then \
206206
${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t7.out > /dev/null ; \
207207
${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t7.out > /dev/null ; \
208208
fi
209209

210210
$(OBJ)/t8.out:
211-
set -xe ; if ssh -Q key | grep -q ^ssh-dss ; then \
211+
set -xe ; if ssh -Q key | grep -q "^ssh-dss" ; then \
212212
${TEST_SSH_SSHKEYGEN} -q -t dsa -N '' -f $@ ; \
213213
fi
214214

215215
t8: $(OBJ)/t8.out
216-
set -xe ; if ssh -Q key | grep -q ^ssh-dss ; then \
216+
set -xe ; if ssh -Q key | grep -q "^ssh-dss" ; then \
217217
${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t8.out > /dev/null ; \
218218
${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t8.out > /dev/null ; \
219219
fi
@@ -237,7 +237,7 @@ t10: $(OBJ)/t10.out
237237
${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t10.out > /dev/null
238238

239239
t11:
240-
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q ^ssh-dss ; then \
240+
set -xe ; if ${TEST_SSH_SSH} -Q key | grep -q "^ssh-dss" ; then \
241241
${TEST_SSH_SSHKEYGEN} -E sha256 -lf ${.CURDIR}/rsa_openssh.pub |\
242242
awk '{print $$2}' | diff - ${.CURDIR}/t11.ok ; \
243243
fi

0 commit comments

Comments
 (0)