summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/ssh.h
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-04-12 07:45:45 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-04-12 07:45:45 +0000
commit02bf74bb72f8e68721c80fd5ee6c50a599ca9350 (patch)
treebf0e02e49adb6b8d3f28a70df49a365f0ef01d8c /usr.bin/ssh/ssh.h
parent3f6547314a456d02e3306664e55213db57f93a14 (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.h')
-rw-r--r--usr.bin/ssh/ssh.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh.h b/usr.bin/ssh/ssh.h
index c8db7daeb77..2c1d443e0c1 100644
--- a/usr.bin/ssh/ssh.h
+++ b/usr.bin/ssh/ssh.h
@@ -13,7 +13,7 @@
*
*/
-/* RCSID("$Id: ssh.h,v 1.36 2000/04/06 08:55:22 markus Exp $"); */
+/* RCSID("$Id: ssh.h,v 1.37 2000/04/12 07:45:44 markus Exp $"); */
#ifndef SSH_H
#define SSH_H
@@ -46,14 +46,16 @@
/*
* Major protocol version. Different version indicates major incompatiblity
* that prevents communication.
- */
-#define PROTOCOL_MAJOR 1
-
-/*
+ *
* Minor protocol version. Different version indicates minor incompatibility
* that does not prevent interoperation.
*/
-#define PROTOCOL_MINOR 5
+#define PROTOCOL_MAJOR_1 1
+#define PROTOCOL_MINOR_1 5
+
+/* We support both SSH1 and SSH2 */
+#define PROTOCOL_MAJOR_2 2
+#define PROTOCOL_MINOR_2 0
/*
* Name for the service. The port named by this service overrides the