diff options
author | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-09-14 23:42:11 +0100 |
commit | 327155e6824b3ee13837bdde04e4eb47e147ff46 (patch) | |
tree | 8f8743122403c7a2e6ed919156711fb1520c657f /regress/cert-hostkey.sh | |
parent | 0334ce32304e9ba2a10ee5ca49ca6e8ff3ba6cf4 (diff) | |
parent | 74e339b8f8936bc0d985e053a076d0c9b5e9ea51 (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.3).
- sftp(1): add support for resuming partial downloads using the "reget"
command and on the sftp commandline or on the "get" commandline using
the "-a" (append) option (closes: #158590).
- ssh(1): add an "IgnoreUnknown" configuration option to selectively
suppress errors arising from unknown configuration directives (closes:
#436052).
- sftp(1): update progressmeter when data is acknowledged, not when it's
sent (partially addresses #708372).
- ssh(1): do not fatally exit when attempting to cleanup multiplexing-
created channels that are incompletely opened (closes: #651357).
Diffstat (limited to 'regress/cert-hostkey.sh')
-rw-r--r-- | regress/cert-hostkey.sh | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh index 6216abd87..35cd39293 100644 --- a/regress/cert-hostkey.sh +++ b/regress/cert-hostkey.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: cert-hostkey.sh,v 1.6 2011/05/20 02:43:36 djm Exp $ | 1 | # $OpenBSD: cert-hostkey.sh,v 1.7 2013/05/17 00:37:40 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="certified host keys" | 4 | tid="certified host keys" |
@@ -18,8 +18,8 @@ HOSTS='localhost-with-alias,127.0.0.1,::1' | |||
18 | ${SSHKEYGEN} -q -N '' -t rsa -f $OBJ/host_ca_key ||\ | 18 | ${SSHKEYGEN} -q -N '' -t rsa -f $OBJ/host_ca_key ||\ |
19 | fail "ssh-keygen of host_ca_key failed" | 19 | fail "ssh-keygen of host_ca_key failed" |
20 | ( | 20 | ( |
21 | echon '@cert-authority ' | 21 | printf '@cert-authority ' |
22 | echon "$HOSTS " | 22 | printf "$HOSTS " |
23 | cat $OBJ/host_ca_key.pub | 23 | cat $OBJ/host_ca_key.pub |
24 | ) > $OBJ/known_hosts-cert | 24 | ) > $OBJ/known_hosts-cert |
25 | 25 | ||
@@ -66,25 +66,25 @@ done | |||
66 | 66 | ||
67 | # Revoked certificates with key present | 67 | # Revoked certificates with key present |
68 | ( | 68 | ( |
69 | echon '@cert-authority ' | 69 | printf '@cert-authority ' |
70 | echon "$HOSTS " | 70 | printf "$HOSTS " |
71 | cat $OBJ/host_ca_key.pub | 71 | cat $OBJ/host_ca_key.pub |
72 | echon '@revoked ' | 72 | printf '@revoked ' |
73 | echon "* " | 73 | printf "* " |
74 | cat $OBJ/cert_host_key_rsa.pub | 74 | cat $OBJ/cert_host_key_rsa.pub |
75 | if test "x$TEST_SSH_ECC" = "xyes"; then | 75 | if test "x$TEST_SSH_ECC" = "xyes"; then |
76 | echon '@revoked ' | 76 | printf '@revoked ' |
77 | echon "* " | 77 | printf "* " |
78 | cat $OBJ/cert_host_key_ecdsa.pub | 78 | cat $OBJ/cert_host_key_ecdsa.pub |
79 | fi | 79 | fi |
80 | echon '@revoked ' | 80 | printf '@revoked ' |
81 | echon "* " | 81 | printf "* " |
82 | cat $OBJ/cert_host_key_dsa.pub | 82 | cat $OBJ/cert_host_key_dsa.pub |
83 | echon '@revoked ' | 83 | printf '@revoked ' |
84 | echon "* " | 84 | printf "* " |
85 | cat $OBJ/cert_host_key_rsa_v00.pub | 85 | cat $OBJ/cert_host_key_rsa_v00.pub |
86 | echon '@revoked ' | 86 | printf '@revoked ' |
87 | echon "* " | 87 | printf "* " |
88 | cat $OBJ/cert_host_key_dsa_v00.pub | 88 | cat $OBJ/cert_host_key_dsa_v00.pub |
89 | ) > $OBJ/known_hosts-cert | 89 | ) > $OBJ/known_hosts-cert |
90 | for privsep in yes no ; do | 90 | for privsep in yes no ; do |
@@ -108,11 +108,11 @@ done | |||
108 | 108 | ||
109 | # Revoked CA | 109 | # Revoked CA |
110 | ( | 110 | ( |
111 | echon '@cert-authority ' | 111 | printf '@cert-authority ' |
112 | echon "$HOSTS " | 112 | printf "$HOSTS " |
113 | cat $OBJ/host_ca_key.pub | 113 | cat $OBJ/host_ca_key.pub |
114 | echon '@revoked ' | 114 | printf '@revoked ' |
115 | echon "* " | 115 | printf "* " |
116 | cat $OBJ/host_ca_key.pub | 116 | cat $OBJ/host_ca_key.pub |
117 | ) > $OBJ/known_hosts-cert | 117 | ) > $OBJ/known_hosts-cert |
118 | for ktype in rsa dsa $ecdsa rsa_v00 dsa_v00 ; do | 118 | for ktype in rsa dsa $ecdsa rsa_v00 dsa_v00 ; do |
@@ -132,8 +132,8 @@ done | |||
132 | 132 | ||
133 | # Create a CA key and add it to known hosts | 133 | # Create a CA key and add it to known hosts |
134 | ( | 134 | ( |
135 | echon '@cert-authority ' | 135 | printf '@cert-authority ' |
136 | echon "$HOSTS " | 136 | printf "$HOSTS " |
137 | cat $OBJ/host_ca_key.pub | 137 | cat $OBJ/host_ca_key.pub |
138 | ) > $OBJ/known_hosts-cert | 138 | ) > $OBJ/known_hosts-cert |
139 | 139 | ||
@@ -200,7 +200,7 @@ for v in v01 v00 ; do | |||
200 | -n $HOSTS $OBJ/cert_host_key_${ktype} || | 200 | -n $HOSTS $OBJ/cert_host_key_${ktype} || |
201 | fail "couldn't sign cert_host_key_${ktype}" | 201 | fail "couldn't sign cert_host_key_${ktype}" |
202 | ( | 202 | ( |
203 | echon "$HOSTS " | 203 | printf "$HOSTS " |
204 | cat $OBJ/cert_host_key_${ktype}.pub | 204 | cat $OBJ/cert_host_key_${ktype}.pub |
205 | ) > $OBJ/known_hosts-cert | 205 | ) > $OBJ/known_hosts-cert |
206 | ( | 206 | ( |
@@ -220,8 +220,8 @@ done | |||
220 | 220 | ||
221 | # Wrong certificate | 221 | # Wrong certificate |
222 | ( | 222 | ( |
223 | echon '@cert-authority ' | 223 | printf '@cert-authority ' |
224 | echon "$HOSTS " | 224 | printf "$HOSTS " |
225 | cat $OBJ/host_ca_key.pub | 225 | cat $OBJ/host_ca_key.pub |
226 | ) > $OBJ/known_hosts-cert | 226 | ) > $OBJ/known_hosts-cert |
227 | for v in v01 v00 ; do | 227 | for v in v01 v00 ; do |