diff options
| author |   djm <djm@openbsd.org> | 2017-04-30 23:10:43 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-04-30 23:10:43 +0000 |
| commit | 67cc3a3cf8518dd2e78b340d35c15dbfd1e7e89d (patch) | |
| tree | 8092cdbbddcde08ee62518f1db74e4b13c5be4f6 /usr.bin/ssh/ssh.c | |
| parent | Make early attrbute work here as well. Remove unreachable panic while there. (diff) | |
| download | wireguard-openbsd-67cc3a3cf8518dd2e78b340d35c15dbfd1e7e89d.tar.xz wireguard-openbsd-67cc3a3cf8518dd2e78b340d35c15dbfd1e7e89d.zip | |
unifdef WITH_SSH1
ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 3579b1f4cce..8cfc35fb939 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.452 2017/04/28 03:20:27 dtucker Exp $ */ +/* $OpenBSD: ssh.c,v 1.453 2017/04/30 23:10:43 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -659,11 +659,7 @@ main(int ac, char **av) else if (strcmp(optarg, "key-plain") == 0) cp = sshkey_alg_list(0, 1, 0, '\n'); else if (strcmp(optarg, "protocol-version") == 0) { -#ifdef WITH_SSH1 - cp = xstrdup("1\n2"); -#else cp = xstrdup("2"); -#endif } if (cp == NULL) fatal("Unsupported query \"%s\"", optarg); @@ -1268,10 +1264,6 @@ main(int ac, char **av) sizeof(Key)); PRIV_START; -#if WITH_SSH1 - sensitive_data.keys[0] = key_load_private_type(KEY_RSA1, - _PATH_HOST_KEY_FILE, "", NULL, NULL); -#endif sensitive_data.keys[1] = key_load_private_cert(KEY_ECDSA, _PATH_HOST_ECDSA_KEY_FILE, "", NULL); sensitive_data.keys[2] = key_load_private_cert(KEY_ED25519, |