~cjwatson/ubuntu/precise/openssh/precise-proposed

« back to all changes in this revision

Viewing changes to regress/Makefile

  • Committer: Colin Watson
  • Date: 2011-01-24 12:43:25 UTC
  • mfrom: (2660.2.14 gssapi)
  • mto: This revision was merged to the branch mainline in revision 3226.
  • Revision ID: cjwatson@debian.org-20110124124325-lpg368jr1esoeqtt
* New upstream release (http://www.openssh.org/txt/release-5.7):
  - Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
    and host/user keys (ECDSA) as specified by RFC5656.  ECDH and ECDSA
    offer better performance than plain DH and DSA at the same equivalent
    symmetric key length, as well as much shorter keys.
  - sftp(1)/sftp-server(8): add a protocol extension to support a hard
    link operation.  It is available through the "ln" command in the
    client.  The old "ln" behaviour of creating a symlink is available
    using its "-s" option or through the preexisting "symlink" command.
  - scp(1): Add a new -3 option to scp: Copies between two remote hosts
    are transferred through the local host (closes: #508613).
  - ssh(1): "atomically" create the listening mux socket by binding it on
    a temporary name and then linking it into position after listen() has
    succeeded.  This allows the mux clients to determine that the server
    socket is either ready or stale without races (closes: #454784).
    Stale server sockets are now automatically removed (closes: #523250).
  - ssh(1): install a SIGCHLD handler to reap expired child process
    (closes: #594687).
  - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
    temporary directories (closes: #357469, although only if you arrange
    for ssh-agent to actually see $TMPDIR since the setgid bit will cause
    it to be stripped off).

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#       $OpenBSD: Makefile,v 1.54 2010/06/27 19:19:56 phessler Exp $
 
1
#       $OpenBSD: Makefile,v 1.58 2011/01/06 22:46:21 djm Exp $
2
2
 
3
 
REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t-exec
 
3
REGRESS_TARGETS=        t1 t2 t3 t4 t5 t6 t7 t8 t9 t-exec
4
4
tests:          $(REGRESS_TARGETS)
5
5
 
6
6
# Interop tests are not run by default
53
53
                localcommand \
54
54
                forcecommand \
55
55
                portnum \
 
56
                keytype \
 
57
                kextype \
56
58
                cert-hostkey \
57
 
                cert-userkey
 
59
                cert-userkey \
 
60
                host-expand
58
61
 
59
62
INTEROP_TESTS=  putty-transfer putty-ciphers putty-kex conch-ciphers
60
63
#INTEROP_TESTS+=ssh-com ssh-com-client ssh-com-keygen ssh-com-sftp
61
64
 
 
65
#LTESTS=        cipher-speed
 
66
 
62
67
USER!=          id -un
63
 
CLEANFILES=     t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2 \
 
68
CLEANFILES=     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 \
64
70
                authorized_keys_${USER} known_hosts pidfile \
65
71
                ssh_config sshd_config.orig ssh_proxy sshd_config sshd_proxy \
66
72
                rsa.pub rsa rsa1.pub rsa1 host.rsa host.rsa1 \
69
75
                scp-ssh-wrapper.scp ssh_proxy_envpass remote_pid \
70
76
                sshd_proxy_bak rsa_ssh2_cr.prv rsa_ssh2_crnl.prv \
71
77
                known_hosts-cert host_ca_key* cert_host_key* \
72
 
                putty.rsa2 sshd_proxy_orig \
73
 
                authorized_principals_${USER}
 
78
                putty.rsa2 sshd_proxy_orig ssh_proxy_bak \
 
79
                key.rsa-* key.dsa-* key.ecdsa-* \
 
80
                authorized_principals_${USER} expect actual
74
81
 
75
82
# Enable all malloc(3) randomisations and checks
76
83
TEST_ENV=      "MALLOC_OPTIONS=AFGJPRX"
77
84
 
 
85
TEST_SSH_SSHKEYGEN?=ssh-keygen
 
86
 
78
87
t1:
79
 
        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
 
89
        tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv
 
90
        ${TEST_SSH_SSHKEYGEN} -if ${.OBJDIR}/rsa_ssh2_cr.prv | diff - ${.CURDIR}/rsa_openssh.prv
 
91
        awk '{print $$0 "\r"}' ${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_crnl.prv
 
92
        ${TEST_SSH_SSHKEYGEN} -if ${.OBJDIR}/rsa_ssh2_crnl.prv | diff - ${.CURDIR}/rsa_openssh.prv
80
93
 
81
94
t2:
82
95
        cat ${.CURDIR}/rsa_openssh.prv > $(OBJ)/t2.out
83
96
        chmod 600 $(OBJ)/t2.out
84
 
        ssh-keygen -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub
 
97
        ${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t2.out | diff - ${.CURDIR}/rsa_openssh.pub
85
98
 
86
99
t3:
87
 
        ssh-keygen -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/rsa_secsh.pub
88
 
        ssh-keygen -if $(OBJ)/rsa_secsh.pub | diff - ${.CURDIR}/rsa_openssh.pub
89
 
        rm -f ${.CURDIR}/rsa_secsh.pub
 
100
        ${TEST_SSH_SSHKEYGEN} -ef ${.CURDIR}/rsa_openssh.pub >$(OBJ)/t3.out
 
101
        ${TEST_SSH_SSHKEYGEN} -if $(OBJ)/t3.out | diff - ${.CURDIR}/rsa_openssh.pub
90
102
 
91
103
t4:
92
 
        ssh-keygen -lf ${.CURDIR}/rsa_openssh.pub |\
 
104
        ${TEST_SSH_SSHKEYGEN} -lf ${.CURDIR}/rsa_openssh.pub |\
93
105
                awk '{print $$2}' | diff - ${.CURDIR}/t4.ok
94
106
 
95
107
t5:
96
 
        ssh-keygen -Bf ${.CURDIR}/rsa_openssh.pub |\
 
108
        ${TEST_SSH_SSHKEYGEN} -Bf ${.CURDIR}/rsa_openssh.pub |\
97
109
                awk '{print $$2}' | diff - ${.CURDIR}/t5.ok
98
110
 
99
111
t6:
100
 
        ssh-keygen -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1
101
 
        ssh-keygen -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2
 
112
        ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.prv > $(OBJ)/t6.out1
 
113
        ${TEST_SSH_SSHKEYGEN} -if ${.CURDIR}/dsa_ssh2.pub > $(OBJ)/t6.out2
102
114
        chmod 600 $(OBJ)/t6.out1
103
 
        ssh-keygen -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2
 
115
        ${TEST_SSH_SSHKEYGEN} -yf $(OBJ)/t6.out1 | diff - $(OBJ)/t6.out2
104
116
 
105
117
$(OBJ)/t7.out:
106
 
        ssh-keygen -q -t rsa -N '' -f $@
 
118
        ${TEST_SSH_SSHKEYGEN} -q -t rsa -N '' -f $@
107
119
 
108
120
t7: $(OBJ)/t7.out
109
 
        ssh-keygen -lf $(OBJ)/t7.out > /dev/null
110
 
        ssh-keygen -Bf $(OBJ)/t7.out > /dev/null
 
121
        ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t7.out > /dev/null
 
122
        ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t7.out > /dev/null
 
123
 
 
124
$(OBJ)/t8.out:
 
125
        ${TEST_SSH_SSHKEYGEN} -q -t dsa -N '' -f $@
 
126
 
 
127
t8: $(OBJ)/t8.out
 
128
        ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t8.out > /dev/null
 
129
        ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t8.out > /dev/null
 
130
 
 
131
$(OBJ)/t9.out:
 
132
        test "${TEST_SSH_ECC}" != yes || \
 
133
        ${TEST_SSH_SSHKEYGEN} -q -t ecdsa -N '' -f $@
 
134
 
 
135
t9: $(OBJ)/t9.out
 
136
        test "${TEST_SSH_ECC}" != yes || \
 
137
        ${TEST_SSH_SSHKEYGEN} -lf $(OBJ)/t9.out > /dev/null
 
138
        test "${TEST_SSH_ECC}" != yes || \
 
139
        ${TEST_SSH_SSHKEYGEN} -Bf $(OBJ)/t9.out > /dev/null
111
140
 
112
141
t-exec: ${LTESTS:=.sh}
113
142
        @if [ "x$?" = "x" ]; then exit 0; fi; \
123
152
                (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
124
153
        done
125
154
 
 
155
# Not run by default
 
156
interop: ${INTEROP_TARGETS}