diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-04-30 23:13:25 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-05-01 09:42:37 +1000 |
| commit | 97f4d3083b036ce3e68d6346a6140a22123d5864 (patch) | |
| tree | 301c95453934721eca9855cd01b1d0da089e3246 /ssh-keyscan.c | |
| parent | 99f95ba82673d33215dce17bfa1512b57f54ec09 (diff) | |
upstream commit
remove compat20/compat13/compat15 variables
ok markus@
Upstream-ID: 43802c035ceb3fef6c50c400e4ecabf12354691c
Diffstat (limited to 'ssh-keyscan.c')
| -rw-r--r-- | ssh-keyscan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 3231ee342..6a9292487 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssh-keyscan.c,v 1.110 2017/04/30 23:10:43 djm Exp $ */ | 1 | /* $OpenBSD: ssh-keyscan.c,v 1.111 2017/04/30 23:13:25 djm Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. | 3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. |
| 4 | * | 4 | * |
| @@ -221,7 +221,6 @@ keygrab_ssh2(con *c) | |||
| 221 | char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT }; | 221 | char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT }; |
| 222 | int r; | 222 | int r; |
| 223 | 223 | ||
| 224 | enable_compat20(); | ||
| 225 | switch (c->c_keytype) { | 224 | switch (c->c_keytype) { |
| 226 | case KT_DSA: | 225 | case KT_DSA: |
| 227 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ? | 226 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = get_cert ? |