diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-03-03 07:48:58 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-03-03 18:54:11 +0100 |
| commit | 68d2dfc464fbcdf8d6387884260f9801f4352393 (patch) | |
| tree | 73bd299fc3cdec7768d13d519b21becccaf41745 /ssh.c | |
| parent | upstream commit (diff) | |
| download | openssh-68d2dfc464fbcdf8d6387884260f9801f4352393.tar.xz openssh-68d2dfc464fbcdf8d6387884260f9801f4352393.zip | |
upstream commit
Allow "ssh -Q protocol-version" to list supported SSH
protocol versions. Useful for detecting builds without SSH v.1 support; idea
and ok markus@
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.415 2015/02/20 22:17:21 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.416 2015/03/03 06:48:58 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -678,6 +678,13 @@ main(int ac, char **av) cp = key_alg_list(1, 0); else if (strcmp(optarg, "key-plain") == 0) cp = key_alg_list(0, 1); + 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); printf("%s\n", cp); |