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-userkey.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-userkey.sh')
-rw-r--r-- | regress/cert-userkey.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh index 3bba9f8f2..6018b38f4 100644 --- a/regress/cert-userkey.sh +++ b/regress/cert-userkey.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: cert-userkey.sh,v 1.10 2013/01/18 00:45:29 djm Exp $ | 1 | # $OpenBSD: cert-userkey.sh,v 1.11 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 user keys" | 4 | tid="certified user keys" |
@@ -126,7 +126,7 @@ for ktype in rsa dsa $ecdsa rsa_v00 dsa_v00 ; do | |||
126 | # Wrong principals list | 126 | # Wrong principals list |
127 | verbose "$tid: ${_prefix} wrong principals key option" | 127 | verbose "$tid: ${_prefix} wrong principals key option" |
128 | ( | 128 | ( |
129 | echon 'cert-authority,principals="gregorsamsa" ' | 129 | printf 'cert-authority,principals="gregorsamsa" ' |
130 | cat $OBJ/user_ca_key.pub | 130 | cat $OBJ/user_ca_key.pub |
131 | ) > $OBJ/authorized_keys_$USER | 131 | ) > $OBJ/authorized_keys_$USER |
132 | ${SSH} -2i $OBJ/cert_user_key_${ktype} \ | 132 | ${SSH} -2i $OBJ/cert_user_key_${ktype} \ |
@@ -138,7 +138,7 @@ for ktype in rsa dsa $ecdsa rsa_v00 dsa_v00 ; do | |||
138 | # Correct principals list | 138 | # Correct principals list |
139 | verbose "$tid: ${_prefix} correct principals key option" | 139 | verbose "$tid: ${_prefix} correct principals key option" |
140 | ( | 140 | ( |
141 | echon 'cert-authority,principals="mekmitasdigoat" ' | 141 | printf 'cert-authority,principals="mekmitasdigoat" ' |
142 | cat $OBJ/user_ca_key.pub | 142 | cat $OBJ/user_ca_key.pub |
143 | ) > $OBJ/authorized_keys_$USER | 143 | ) > $OBJ/authorized_keys_$USER |
144 | ${SSH} -2i $OBJ/cert_user_key_${ktype} \ | 144 | ${SSH} -2i $OBJ/cert_user_key_${ktype} \ |
@@ -154,7 +154,7 @@ basic_tests() { | |||
154 | if test "x$auth" = "xauthorized_keys" ; then | 154 | if test "x$auth" = "xauthorized_keys" ; then |
155 | # Add CA to authorized_keys | 155 | # Add CA to authorized_keys |
156 | ( | 156 | ( |
157 | echon 'cert-authority ' | 157 | printf 'cert-authority ' |
158 | cat $OBJ/user_ca_key.pub | 158 | cat $OBJ/user_ca_key.pub |
159 | ) > $OBJ/authorized_keys_$USER | 159 | ) > $OBJ/authorized_keys_$USER |
160 | else | 160 | else |
@@ -264,7 +264,7 @@ test_one() { | |||
264 | if test "x$auth" = "xauthorized_keys" ; then | 264 | if test "x$auth" = "xauthorized_keys" ; then |
265 | # Add CA to authorized_keys | 265 | # Add CA to authorized_keys |
266 | ( | 266 | ( |
267 | echon "cert-authority${auth_opt} " | 267 | printf "cert-authority${auth_opt} " |
268 | cat $OBJ/user_ca_key.pub | 268 | cat $OBJ/user_ca_key.pub |
269 | ) > $OBJ/authorized_keys_$USER | 269 | ) > $OBJ/authorized_keys_$USER |
270 | else | 270 | else |