diff options
author | Damien Miller <djm@mindrot.org> | 2006-01-31 22:06:14 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-01-31 22:06:14 +1100 |
commit | 7410ad79f85a62361a6e40ac4ea11e6504408666 (patch) | |
tree | e89ac045835872e0c574cf5e5ef22836ab8426ce | |
parent | 0b996462f842e6b5a5d409ad4538e1779dd69bf6 (diff) |
- djm@cvs.openbsd.org 2006/01/31 10:23:23
[scp.sh]
regression test for CVE-2006-0225 written by dtucker@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/scp.sh | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -63,6 +63,9 @@ | |||
63 | - djm@cvs.openbsd.org 2006/01/27 06:49:21 | 63 | - djm@cvs.openbsd.org 2006/01/27 06:49:21 |
64 | [scp.sh] | 64 | [scp.sh] |
65 | regress test for local to local scp copies; ok dtucker@ | 65 | regress test for local to local scp copies; ok dtucker@ |
66 | - djm@cvs.openbsd.org 2006/01/31 10:23:23 | ||
67 | [scp.sh] | ||
68 | regression test for CVE-2006-0225 written by dtucker@ | ||
66 | 69 | ||
67 | 20060129 | 70 | 20060129 |
68 | - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the | 71 | - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the |
@@ -3788,4 +3791,4 @@ | |||
3788 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3791 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3789 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3792 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3790 | 3793 | ||
3791 | $Id: ChangeLog,v 1.4109 2006/01/31 11:05:23 djm Exp $ | 3794 | $Id: ChangeLog,v 1.4110 2006/01/31 11:06:14 djm Exp $ |
diff --git a/regress/scp.sh b/regress/scp.sh index 02f541011..bfda670bb 100644 --- a/regress/scp.sh +++ b/regress/scp.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: scp.sh,v 1.5 2006/01/27 06:49:21 djm Exp $ | 1 | # $OpenBSD: scp.sh,v 1.6 2006/01/31 10:23:23 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="scp" | 4 | tid="scp" |
@@ -82,6 +82,13 @@ cp ${DATA} ${DIR}/copy | |||
82 | $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed" | 82 | $SCP $scpopts -r somehost:${DIR} ${DIR2} || fail "copy failed" |
83 | diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" | 83 | diff ${DIFFOPT} ${DIR} ${DIR2} || fail "corrupted copy" |
84 | 84 | ||
85 | verbose "$tid: shell metacharacters" | ||
86 | scpclean | ||
87 | (cd ${DIR} && \ | ||
88 | touch '`touch metachartest`' && \ | ||
89 | $SCP $scpopts *metachar* ${DIR2} 2>/dev/null; \ | ||
90 | [ ! -f metachartest ] ) || fail "shell metacharacters" | ||
91 | |||
85 | if [ ! -z "$SUDO" ]; then | 92 | if [ ! -z "$SUDO" ]; then |
86 | verbose "$tid: skipped file after scp -p with failed chown+utimes" | 93 | verbose "$tid: skipped file after scp -p with failed chown+utimes" |
87 | scpclean | 94 | scpclean |