diff options
| author |   markus <markus@openbsd.org> | 2000-04-26 22:43:14 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2000-04-26 22:43:14 +0000 |
| commit | eabd10fbb12c7f3e8f6b32102d3fbe34276d4d95 (patch) | |
| tree | 29332b36d9189adfd750a0bfe12192494a6f131f | |
| parent | host key becomes /etc/ssh_host_dsa_key (diff) | |
| download | wireguard-openbsd-eabd10fbb12c7f3e8f6b32102d3fbe34276d4d95.tar.xz wireguard-openbsd-eabd10fbb12c7f3e8f6b32102d3fbe34276d4d95.zip | |
ssh/sshd default to proto 1 and 2
| -rw-r--r-- | usr.bin/ssh/readconf.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/servconf.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index eac514ea530..1e30bc830d4 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$Id: readconf.c,v 1.27 2000/04/26 20:56:29 markus Exp $"); +RCSID("$Id: readconf.c,v 1.28 2000/04/26 22:43:14 markus Exp $"); #include "ssh.h" #include "cipher.h" @@ -738,7 +738,7 @@ fill_default_options(Options * options) if (options->cipher == -1) options->cipher = SSH_CIPHER_NOT_SET; if (options->protocol == SSH_PROTO_UNKNOWN) - options->protocol = SSH_PROTO_1; + options->protocol = SSH_PROTO_1|SSH_PROTO_2|SSH_PROTO_1_PREFERRED; if (options->num_identity_files == 0) { options->identity_files[0] = xmalloc(2 + strlen(SSH_CLIENT_IDENTITY) + 1); diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index 75ce330053c..ad4f62735af 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$Id: servconf.c,v 1.34 2000/04/14 10:30:33 markus Exp $"); +RCSID("$Id: servconf.c,v 1.35 2000/04/26 22:43:15 markus Exp $"); #include "ssh.h" #include "servconf.h" @@ -143,7 +143,7 @@ fill_default_server_options(ServerOptions *options) if (options->use_login == -1) options->use_login = 0; if (options->protocol == SSH_PROTO_UNKNOWN) - options->protocol = SSH_PROTO_1; + options->protocol = SSH_PROTO_1|SSH_PROTO_2; } #define WHITESPACE " \t\r\n" |