summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2013-05-17 14:47:51 +1000
committerDarren Tucker <dtucker@zip.com.au>2013-05-17 14:47:51 +1000
commit34035be27b7ddd84706fe95c39d37cba7d5c9572 (patch)
tree7fcd130aeac990f04ed4448e4423fbae510138c7
parentb8b96b0aa634d440feba4331c80ae4de9dda2081 (diff)
- dtucker@cvs.openbsd.org 2013/05/17 01:32:11
[regress/integrity.sh] don't print output from ssh before getting it (it's available in ssh.log)
-rw-r--r--ChangeLog3
-rw-r--r--regress/integrity.sh4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index db23b2e2a..a12bf335c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,9 @@
55 - TIMEOUT is a read-only variable in some shells 55 - TIMEOUT is a read-only variable in some shells
56 - not all greps have -q so redirect to /dev/null instead. 56 - not all greps have -q so redirect to /dev/null instead.
57 (ID sync only) 57 (ID sync only)
58 - dtucker@cvs.openbsd.org 2013/05/17 01:32:11
59 [regress/integrity.sh]
60 don't print output from ssh before getting it (it's available in ssh.log)
58 - (dtucker) [regress/bsd.regress.mk] Remove unused file. We've never used it 61 - (dtucker) [regress/bsd.regress.mk] Remove unused file. We've never used it
59 in portable and it's long gone in openbsd. 62 in portable and it's long gone in openbsd.
60 - (dtucker) [regress/integrity.sh]. Force fixed Diffie-Hellman key exchange 63 - (dtucker) [regress/integrity.sh]. Force fixed Diffie-Hellman key exchange
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 2621a0025..982eced21 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: integrity.sh,v 1.9 2013/04/07 02:16:03 dtucker Exp $ 1# $OpenBSD: integrity.sh,v 1.10 2013/05/17 01:32:11 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="integrity" 4tid="integrity"
@@ -52,7 +52,7 @@ for m in $macs; do
52 aes*gcm*) macopt="-c $m";; 52 aes*gcm*) macopt="-c $m";;
53 *) macopt="-m $m";; 53 *) macopt="-m $m";;
54 esac 54 esac
55 verbose "test $tid: $m @$off $output" 55 verbose "test $tid: $m @$off"
56 ${SSH} $macopt -2F $OBJ/ssh_proxy -o "$pxy" \ 56 ${SSH} $macopt -2F $OBJ/ssh_proxy -o "$pxy" \
57 999.999.999.999 'printf "%4096s" " "' >/dev/null 57 999.999.999.999 'printf "%4096s" " "' >/dev/null
58 if [ $? -eq 0 ]; then 58 if [ $? -eq 0 ]; then