diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | regress/integrity.sh | 4 | ||||
-rw-r--r-- | regress/krl.sh | 4 | ||||
-rw-r--r-- | regress/test-exec.sh | 6 |
4 files changed, 8 insertions, 8 deletions
@@ -78,6 +78,8 @@ | |||
78 | - (dtucker) [openbsd-compat/getopt.h] Remove unneeded bits. | 78 | - (dtucker) [openbsd-compat/getopt.h] Remove unneeded bits. |
79 | - (dtucker) [regress/cfgmatch.sh] Resync config file setup with openbsd. | 79 | - (dtucker) [regress/cfgmatch.sh] Resync config file setup with openbsd. |
80 | - (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd. | 80 | - (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd. |
81 | - (dtucker) [regress/integrity.sh regress/krl.sh regress/test-exec.sh] | ||
82 | Move the jot helper function to portable-specific part of test-exec.sh. | ||
81 | 83 | ||
82 | 20130516 | 84 | 20130516 |
83 | - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be | 85 | - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be |
diff --git a/regress/integrity.sh b/regress/integrity.sh index 982eced21..1d17fe10a 100644 --- a/regress/integrity.sh +++ b/regress/integrity.sh | |||
@@ -29,10 +29,6 @@ echo "KexAlgorithms diffie-hellman-group14-sha1,diffie-hellman-group1-sha1" \ | |||
29 | # sshd-command for proxy (see test-exec.sh) | 29 | # sshd-command for proxy (see test-exec.sh) |
30 | cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy" | 30 | cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy" |
31 | 31 | ||
32 | jot() { | ||
33 | awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }" | ||
34 | } | ||
35 | |||
36 | for m in $macs; do | 32 | for m in $macs; do |
37 | trace "test $tid: mac $m" | 33 | trace "test $tid: mac $m" |
38 | elen=0 | 34 | elen=0 |
diff --git a/regress/krl.sh b/regress/krl.sh index 62a239c38..de9cc8764 100644 --- a/regress/krl.sh +++ b/regress/krl.sh | |||
@@ -39,10 +39,6 @@ serial: 799 | |||
39 | serial: 599-701 | 39 | serial: 599-701 |
40 | EOF | 40 | EOF |
41 | 41 | ||
42 | jot() { | ||
43 | awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }" | ||
44 | } | ||
45 | |||
46 | # A specification that revokes some certificated by key ID. | 42 | # A specification that revokes some certificated by key ID. |
47 | touch $OBJ/revoked-keyid | 43 | touch $OBJ/revoked-keyid |
48 | for n in 1 2 3 4 10 15 30 50 `jot 500 300` 999 1000 1001 1002; do | 44 | for n in 1 2 3 4 10 15 30 50 `jot 500 300` 999 1000 1001 1002; do |
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 599b8d9ba..910ed4f70 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -177,6 +177,7 @@ rm -f ${COPY} | |||
177 | export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP | 177 | export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP |
178 | #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP | 178 | #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP |
179 | 179 | ||
180 | # Portable specific functions | ||
180 | have_prog() | 181 | have_prog() |
181 | { | 182 | { |
182 | saved_IFS="$IFS" | 183 | saved_IFS="$IFS" |
@@ -192,6 +193,11 @@ have_prog() | |||
192 | return 1 | 193 | return 1 |
193 | } | 194 | } |
194 | 195 | ||
196 | jot() { | ||
197 | awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }" | ||
198 | } | ||
199 | # End of portable specific functions | ||
200 | |||
195 | cleanup () | 201 | cleanup () |
196 | { | 202 | { |
197 | if [ -f $PIDFILE ]; then | 203 | if [ -f $PIDFILE ]; then |