diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2000-04-12 07:45:45 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2000-04-12 07:45:45 +0000 |
| commit | 02bf74bb72f8e68721c80fd5ee6c50a599ca9350 (patch) | |
| tree | bf0e02e49adb6b8d3f28a70df49a365f0ef01d8c /usr.bin/ssh/ssh.c | |
| parent | 3f6547314a456d02e3306664e55213db57f93a14 (diff) | |
add Cipher and Protocol options to ssh/sshd, e.g.:
ssh -o 'Protocol 1,2' if you prefer proto 1, ssh -o 'Ciphers arcfour,3des-cbc'
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 35dc45d2d1b..ecf3e824546 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.45 2000/04/04 15:19:42 markus Exp $"); +RCSID("$Id: ssh.c,v 1.46 2000/04/12 07:45:44 markus Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -32,6 +32,7 @@ int IPv4or6 = AF_UNSPEC; /* Flag indicating whether debug mode is on. This can be set on the command line. */ int debug_flag = 0; +/* Flag indicating whether a tty should be allocated */ int tty_flag = 0; /* don't exec a shell */ @@ -326,8 +327,10 @@ main(int ac, char **av) case 'v': case 'V': - fprintf(stderr, "SSH Version %s, protocol version %d.%d.\n", - SSH_VERSION, PROTOCOL_MAJOR, PROTOCOL_MINOR); + fprintf(stderr, "SSH Version %s, protocol versions %d.%d/%d.%d.\n", + SSH_VERSION, + PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1, + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2); fprintf(stderr, "Compiled with SSL (0x%8.8lx).\n", SSLeay()); if (opt == 'V') exit(0); |