summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
Diffstat (limited to 'regress')
-rw-r--r--regress/hostkey-agent.sh4
-rw-r--r--regress/keygen-knownhosts.sh18
2 files changed, 11 insertions, 11 deletions
diff --git a/regress/hostkey-agent.sh b/regress/hostkey-agent.sh
index fddb0415b..c007d7a5e 100644
--- a/regress/hostkey-agent.sh
+++ b/regress/hostkey-agent.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: hostkey-agent.sh,v 1.3 2015/01/20 08:02:33 djm Exp $ 1# $OpenBSD: hostkey-agent.sh,v 1.4 2015/01/27 12:01:36 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="hostkey agent" 4tid="hostkey agent"
@@ -17,7 +17,7 @@ trace "load hostkeys"
17for k in `${SSH} -Q key-plain` ; do 17for k in `${SSH} -Q key-plain` ; do
18 ${SSHKEYGEN} -qt $k -f $OBJ/agent-key.$k -N '' || fatal "ssh-keygen $k" 18 ${SSHKEYGEN} -qt $k -f $OBJ/agent-key.$k -N '' || fatal "ssh-keygen $k"
19 ( 19 (
20 echo -n 'localhost-with-alias,127.0.0.1,::1 ' 20 printf 'localhost-with-alias,127.0.0.1,::1 '
21 cat $OBJ/agent-key.$k.pub 21 cat $OBJ/agent-key.$k.pub
22 ) >> $OBJ/known_hosts.orig 22 ) >> $OBJ/known_hosts.orig
23 ${SSHADD} $OBJ/agent-key.$k >/dev/null 2>&1 || \ 23 ${SSHADD} $OBJ/agent-key.$k >/dev/null 2>&1 || \
diff --git a/regress/keygen-knownhosts.sh b/regress/keygen-knownhosts.sh
index 35a5ea499..085aac650 100644
--- a/regress/keygen-knownhosts.sh
+++ b/regress/keygen-knownhosts.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: keygen-knownhosts.sh,v 1.1 2015/01/18 22:00:18 djm Exp $ 1# $OpenBSD: keygen-knownhosts.sh,v 1.2 2015/01/27 12:01:36 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="ssh-keygen known_hosts" 4tid="ssh-keygen known_hosts"
@@ -13,13 +13,13 @@ for x in host-a host-b host-c host-d host-e host-f host-a2 host-b2; do
13 echo "# $x" >> $OBJ/kh.hosts 13 echo "# $x" >> $OBJ/kh.hosts
14 ( 14 (
15 case "$x" in 15 case "$x" in
16 host-a|host-b) echo -n "$x " ;; 16 host-a|host-b) printf "$x " ;;
17 host-c) echo -n "@cert-authority $x " ;; 17 host-c) printf "@cert-authority $x " ;;
18 host-d) echo -n "@revoked $x " ;; 18 host-d) printf "@revoked $x " ;;
19 host-e) echo -n "host-e* " ;; 19 host-e) printf "host-e* " ;;
20 host-f) echo -n "host-f,host-g,host-h " ;; 20 host-f) printf "host-f,host-g,host-h " ;;
21 host-a2) echo -n "host-a " ;; 21 host-a2) printf "host-a " ;;
22 host-b2) echo -n "host-b " ;; 22 host-b2) printf "host-b " ;;
23 esac 23 esac
24 cat $OBJ/kh.${x}.pub 24 cat $OBJ/kh.${x}.pub
25 # Blank line should be preserved. 25 # Blank line should be preserved.
@@ -47,7 +47,7 @@ expect_key() {
47 test "x$_mark" = "xREVOKED" && _marker="@revoked " 47 test "x$_mark" = "xREVOKED" && _marker="@revoked "
48 test "x$_line" != "x" && 48 test "x$_line" != "x" &&
49 echo "# Host $_host found: line $_line $_mark" >> $OBJ/kh.expect 49 echo "# Host $_host found: line $_line $_mark" >> $OBJ/kh.expect
50 echo -n "${_marker}$_hosts " >> $OBJ/kh.expect 50 printf "${_marker}$_hosts " >> $OBJ/kh.expect
51 cat $OBJ/kh.${_key}.pub >> $OBJ/kh.expect || 51 cat $OBJ/kh.${_key}.pub >> $OBJ/kh.expect ||
52 fatal "${_key}.pub missing" 52 fatal "${_key}.pub missing"
53} 53}