summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
Diffstat (limited to 'regress')
-rw-r--r--regress/Makefile48
1 files changed, 25 insertions, 23 deletions
diff --git a/regress/Makefile b/regress/Makefile
index 776a29c54..f114c27e9 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -65,7 +65,7 @@ INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers
65#LTESTS= cipher-speed 65#LTESTS= cipher-speed
66 66
67USER!= id -un 67USER!= id -un
68CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \ 68CLEANFILES= t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
69 t8.out t8.out.pub t9.out t9.out.pub \ 69 t8.out t8.out.pub t9.out t9.out.pub \
70 authorized_keys_${USER} known_hosts pidfile \ 70 authorized_keys_${USER} known_hosts pidfile \
71 ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \ 71 ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
@@ -75,66 +75,68 @@ CLEANFILES= t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
75 scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \ 75 scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \
76 sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \ 76 sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
77 known_hosts-cert host_ca_key* cert_host_key* \ 77 known_hosts-cert host_ca_key* cert_host_key* \
78 putty.rsa2 sshd_proxy_orig ssh_proxy_bak key.[rd]sa-* \ 78 putty.rsa2 sshd_proxy_orig ssh_proxy_bak \
79 key.rsa-* key.dsa-* key.ecdsa-* \
79 authorized_principals_${USER} expect actual 80 authorized_principals_${USER} expect actual
80 81
81# Enable all malloc(3) randomisations and checks 82# Enable all malloc(3) randomisations and checks
82TEST_ENV= "MALLOC_OPTIONS=AFGJPRX" 83TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
83 84
85TEST_SSH_SSHKEYGEN?=ssh-keygen
86
84t1: 87t1:
85 ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv 88 ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
86 tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv 89 tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv
87 ssh-keygen -if ${.OBJDIR}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv 90 ${TEST_SSH_SSHKEYGEN} -if ${.OBJDIR}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv
88 awk '{print $$0 "\r"}' ${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_crnl.prv 91 awk '{print $$0 "\r"}' ${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_crnl.prv
89 ssh-keygen -if ${.OBJDIR}/rsa_ssh2_crnl.prv | diff - ${.CURDIR}/rsa_openssh.prv 92 ${TEST_SSH_SSHKEYGEN} -if ${.OBJDIR}/rsa_ssh2_crnl.prv | diff - ${.CURDIR}/rsa_openssh.prv
90 93
91t2: 94t2:
92 cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out 95 cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out
93 chmod 600 $(OBJ)/t2.out 96 chmod 600 $(OBJ)/t2.out
94 ssh-keygen -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub 97 ${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub
95 98
96t3: 99t3:
97 ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub 100 ${TEST_SSH_SSHKEYGEN} -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/t3.out
98 ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub 101 ${TEST_SSH_SSHKEYGEN} -if $(OBJ)/t3.out | diff - ${.CURDIR}/rsa_openssh.pub
99 rm -f ${.CURDIR}/rsa_secsh.pub
100 102
101t4: 103t4:
102 ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\ 104 ${TEST_SSH_SSHKEYGEN} -lf ${.CURDIR}/rsa_openssh.pub |\
103 awk '{print $$2}' | diff - ${.CURDIR}/t4.ok 105 awk '{print $$2}' | diff - ${.CURDIR}/t4.ok
104 106
105t5: 107t5:
106 ssh-keygen -Bf ${.CURDIR}/rsa_openssh.pub |\ 108 ${TEST_SSH_SSHKEYGEN} -Bf ${.CURDIR}/rsa_openssh.pub |\
107 awk '{print $$2}' | diff - ${.CURDIR}/t5.ok 109 awk '{print $$2}' | diff - ${.CURDIR}/t5.ok
108 110
109t6: 111t6:
110 ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1 112 ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1
111 ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2 113 ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2
112 chmod 600 $(OBJ)/t6.out1 114 chmod 600 $(OBJ)/t6.out1
113 ssh-keygen -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2 115 ${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2
114 116
115$(OBJ)/t7.out: 117$(OBJ)/t7.out:
116 ssh-keygen -q -t rsa -N '' -f $@ 118 ${TEST_SSH_SSHKEYGEN} -q -t rsa -N '' -f $@
117 119
118t7: $(OBJ)/t7.out 120t7: $(OBJ)/t7.out
119 ssh-keygen -lf $(OBJ)/t7.out > /dev/null 121 ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t7.out > /dev/null
120 ssh-keygen -Bf $(OBJ)/t7.out > /dev/null 122 ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t7.out > /dev/null
121 123
122$(OBJ)/t8.out: 124$(OBJ)/t8.out:
123 ssh-keygen -q -t dsa -N '' -f $@ 125 ${TEST_SSH_SSHKEYGEN} -q -t dsa -N '' -f $@
124 126
125t8: $(OBJ)/t8.out 127t8: $(OBJ)/t8.out
126 ssh-keygen -lf $(OBJ)/t8.out > /dev/null 128 ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t8.out > /dev/null
127 ssh-keygen -Bf $(OBJ)/t8.out > /dev/null 129 ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t8.out > /dev/null
128 130
129$(OBJ)/t9.out: 131$(OBJ)/t9.out:
130 test "${TEST_SSH_ECC}" != yes || \ 132 test "${TEST_SSH_ECC}" != yes || \
131 ssh-keygen -q -t ecdsa -N '' -f $@ 133 ${TEST_SSH_SSHKEYGEN} -q -t ecdsa -N '' -f $@
132 134
133t9: $(OBJ)/t9.out 135t9: $(OBJ)/t9.out
134 test "${TEST_SSH_ECC}" != yes || \ 136 test "${TEST_SSH_ECC}" != yes || \
135 ssh-keygen -lf $(OBJ)/t9.out > /dev/null 137 ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t9.out > /dev/null
136 test "${TEST_SSH_ECC}" != yes || \ 138 test "${TEST_SSH_ECC}" != yes || \
137 ssh-keygen -Bf $(OBJ)/t9.out > /dev/null 139 ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null
138 140
139t-exec: ${LTESTS:=.sh} 141t-exec: ${LTESTS:=.sh}
140 @if [ "x$?" = "x" ]; then exit 0; fi; \ 142 @if [ "x$?" = "x" ]; then exit 0; fi; \