diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2015-10-26 02:50:58 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-10-29 19:07:19 +1100 |
commit | abd9dbc3c0d8c8c7561347cfa22166156e78c077 (patch) | |
tree | be4e48975ce50e3114023e0408a4e53951ca34bd /regress | |
parent | ed08510d38aef930a061ae30d10f2a9cf233bafa (diff) |
upstream commit
Fix typo certopt->certopts in shell variable. This would
cause the test to hang at a host key prompt if you have an A or CNAME for
"proxy" in your local domain.
Upstream-Regress-ID: 6ea03bcd39443a83c89e2c5606392ceb9585836a
Diffstat (limited to 'regress')
-rw-r--r-- | regress/limit-keytype.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/limit-keytype.sh b/regress/limit-keytype.sh index aaf2d2d44..71781b26e 100644 --- a/regress/limit-keytype.sh +++ b/regress/limit-keytype.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: limit-keytype.sh,v 1.2 2015/09/24 06:16:53 djm Exp $ | 1 | # $OpenBSD: limit-keytype.sh,v 1.3 2015/10/26 02:50:58 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="restrict pubkey type" | 4 | tid="restrict pubkey type" |
@@ -59,7 +59,7 @@ ${SSH} $opts -i $OBJ/user_key2 proxy true || fatal "key2 failed" | |||
59 | # Allow plain Ed25519 and RSA. The certificate should fail. | 59 | # Allow plain Ed25519 and RSA. The certificate should fail. |
60 | verbose "allow rsa,ed25519" | 60 | verbose "allow rsa,ed25519" |
61 | prepare_config "PubkeyAcceptedKeyTypes ssh-rsa,ssh-ed25519" | 61 | prepare_config "PubkeyAcceptedKeyTypes ssh-rsa,ssh-ed25519" |
62 | ${SSH} $certopt proxy true && fatal "cert succeeded" | 62 | ${SSH} $certopts proxy true && fatal "cert succeeded" |
63 | ${SSH} $opts -i $OBJ/user_key1 proxy true || fatal "key1 failed" | 63 | ${SSH} $opts -i $OBJ/user_key1 proxy true || fatal "key1 failed" |
64 | ${SSH} $opts -i $OBJ/user_key2 proxy true || fatal "key2 failed" | 64 | ${SSH} $opts -i $OBJ/user_key2 proxy true || fatal "key2 failed" |
65 | 65 | ||